diff options
| author | Thomas Deutschmann <whissi@gentoo.org> | 2020-05-14 23:43:16 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-05-14 23:43:37 +0200 |
| commit | 9ff2ac47c33146fd9a72599ee3f38f32f98b08dc (patch) | |
| tree | 5355fcb1c8bfb8603c3a7ec99f9f6c78e84d0cf0 /dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch | |
| parent | bff018bc9e26a181b25250edd90192b22736fd02 (diff) | |
| download | gentoo-9ff2ac47c33146fd9a72599ee3f38f32f98b08dc.tar.gz gentoo-9ff2ac47c33146fd9a72599ee3f38f32f98b08dc.tar.bz2 gentoo-9ff2ac47c33146fd9a72599ee3f38f32f98b08dc.zip | |
dev-libs/json-c: fix patch naming
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch')
| -rw-r--r-- | dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch new file mode 100644 index 000000000000..3913fc320bca --- /dev/null +++ b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba692ff..fc2edff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,6 +65,7 @@ include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + option(BUILD_SHARED_LIBS "Default to building shared libraries" ON) ++option(BUILD_STATIC_LIBS "Default to building static libraries" OFF) + + # Generate a release merge and test it to verify the correctness of republishing the package. + ADD_CUSTOM_TARGET(distcheck +@@ -383,7 +384,7 @@ add_library(${PROJECT_NAME} + set_target_properties(${PROJECT_NAME} PROPERTIES + VERSION 5.0.0 + SOVERSION 5) +- ++list(APPEND CMAKE_TARGETS ${PROJECT_NAME}) + # If json-c is used as subroject it set to target correct interface -I flags and allow + # to build external target without extra include_directories(...) + target_include_directories(${PROJECT_NAME} +@@ -392,7 +393,33 @@ target_include_directories(${PROJECT_NAME} + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> + ) + +-install(TARGETS ${PROJECT_NAME} ++# Allow to build static and shared libraries at the same time ++if (BUILD_STATIC_LIBS) ++ set(STATIC_LIB ${PROJECT_NAME}-static) ++ add_library(${STATIC_LIB} STATIC ++ ${JSON_C_SOURCES} ++ ${JSON_C_HEADERS} ++ ) ++ ++ # rename the static library ++ set_target_properties(${STATIC_LIB} PROPERTIES ++ OUTPUT_NAME ${PROJECT_NAME} ++ ) ++ list(APPEND CMAKE_TARGETS ${STATIC_LIB}) ++endif () ++ ++# Always create new install dirs with 0755 permissions, regardless of umask ++set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS ++ OWNER_READ ++ OWNER_WRITE ++ OWNER_EXECUTE ++ GROUP_READ ++ GROUP_EXECUTE ++ WORLD_READ ++ WORLD_EXECUTE ++ ) ++ ++install(TARGETS ${CMAKE_TARGETS} + EXPORT ${PROJECT_NAME}-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |