# HG changeset patch # User Franz Glasner # Date 1742326649 -3600 # Node ID 40cf179a620e4a8e8eaa996c32be39d9cd15597b # Parent 4746e1c5cb56efaf7c568ceb0adb45f0bb4b71cc FIX: Allow to build with clang/cc instead of gcc. CMakeLists.txt needed proper tewaking. Also assume that libprom.so is already installed (header and lib) into /usr/local/{include,lib}. diff -r 4746e1c5cb56 -r 40cf179a620e Makefile --- a/Makefile Tue Mar 18 18:17:59 2025 +0100 +++ b/Makefile Tue Mar 18 20:37:29 2025 +0100 @@ -19,8 +19,6 @@ LIB_DEPENDS= libprom.so:net-mgmt/prometheus-client-c-libprom \ libmicrohttpd.so:www/libmicrohttpd -# Currently compilation errors on incompatible types with clang -USE_GCC= yes USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/promhttp diff -r 4746e1c5cb56 -r 40cf179a620e files/patch-promhttp_CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-promhttp_CMakeLists.txt Tue Mar 18 20:37:29 2025 +0100 @@ -0,0 +1,31 @@ +--- promhttp/CMakeLists.txt.orig 2020-12-08 07:38:13 UTC ++++ promhttp/CMakeLists.txt +@@ -38,7 +38,7 @@ set(private_files ${private_dir}/promhttp.c) + set(public_files ${public_dir}/promhttp.h) + set(private_files ${private_dir}/promhttp.c) + +-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../prom/build) ++link_directories(/usr/local/lib) + + include(FindThreads) + +@@ -46,7 +46,7 @@ target_include_directories( + + target_include_directories( + promhttp +- PUBLIC ${public_dir} /usr/include ${prom_include_dir} ++ PUBLIC ${public_dir} /usr/include /usr/local/include + PRIVATE ${private_dir} + ) + +@@ -56,8 +56,8 @@ target_sources( + PRIVATE ${private_files} + ) + +-find_library(prom prom HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../prom/build) +-find_library(microhttpd microhttpd) ++find_library(prom prom HINT /usr/local/lib) ++find_library(microhttpd microhttpd HINT /usr/local/lib) + + target_compile_options(promhttp PRIVATE "-Werror" "-Wuninitialized" "-Wall" "-Wno-unused-label" "-std=gnu11") + target_compile_options(promhttp PUBLIC "-Werror" "-Wuninitialized" "-Wall" "-Wno-unused-label" "-std=gnu11")