diff options
| author | David Elsing <david.elsing@posteo.net> | 2024-03-23 22:04:54 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-06-18 11:42:07 +0200 |
| commit | bec16cc91099a70bef0fc399cdd625b08db5bc8c (patch) | |
| tree | d9cd25866f65d4db6b8822701d197375e935f9c2 /gnu/packages/patches | |
| parent | ab6e8ecbb5d0ae24528e9de8b1604bb1d158c16a (diff) | |
| download | guix-patches-bec16cc91099a70bef0fc399cdd625b08db5bc8c.tar guix-patches-bec16cc91099a70bef0fc399cdd625b08db5bc8c.tar.gz | |
gnu: clog: Add "-DUSE_SYSTEM_LIBS=ON" configure flag.
* gnu/packages/parallel.scm (clog)[arguments]: Add "-DUSE_SYSTEM_LIBS=ON"
to #:configure-flags.
* gnu/packages/patches/clog-fix-shared-build.patch: Adjust patch.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/clog-fix-shared-build.patch | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/gnu/packages/patches/clog-fix-shared-build.patch b/gnu/packages/patches/clog-fix-shared-build.patch index bf80544b90..eb305339f5 100644 --- a/gnu/packages/patches/clog-fix-shared-build.patch +++ b/gnu/packages/patches/clog-fix-shared-build.patch @@ -1,50 +1,19 @@ Author: Antero Mejr <antero@mailbox.org> -Notes: Disabled function visibility hacks and googletest download. Enabled -non-static builds. +Notes: Disabled function visibility hacks. Enabled non-static builds. diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index 083f519..b7b225a 100644 +index 6e50c41..db02e95 100644 --- a/deps/clog/CMakeLists.txt +++ b/deps/clog/CMakeLists.txt -@@ -38,20 +38,8 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deps - SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps - CACHE PATH "Confu-style dependencies binary directory") +@@ -55,7 +55,7 @@ IF(CLOG_BUILD_TESTS) + ENDIF() --IF(CLOG_BUILD_TESTS) -- IF(NOT DEFINED GOOGLETEST_SOURCE_DIR) -- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") -- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory") -- ENDIF() --ENDIF() -- # ---[ clog library -ADD_LIBRARY(clog STATIC src/clog.c) +ADD_LIBRARY(clog src/clog.c) SET_TARGET_PROPERTIES(clog PROPERTIES C_STANDARD 99 C_EXTENSIONS NO) -@@ -74,16 +62,6 @@ INSTALL(TARGETS clog - - # ---[ clog tests - IF(CLOG_BUILD_TESTS) -- # ---[ Build google test -- IF(NOT TARGET gtest) -- IF(MSVC AND NOT CLOG_RUNTIME_TYPE STREQUAL "static") -- SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- ENDIF() -- ADD_SUBDIRECTORY( -- "${GOOGLETEST_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest") -- ENDIF() -- - ADD_EXECUTABLE(clog-test test/clog.cc) - SET_TARGET_PROPERTIES(clog-test PROPERTIES - CXX_STANDARD 11 diff --git a/deps/clog/include/clog.h b/deps/clog/include/clog.h index 4143761..aa9000f 100644 --- a/deps/clog/include/clog.h |