a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
96 lines
3.7 KiB
Diff
96 lines
3.7 KiB
Diff
From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 15 Oct 2020 22:26:55 +0200
|
|
Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS
|
|
|
|
Don't build and install pistache_shared if the standard cmake
|
|
BUILD_SHARED_LIBS is set to OFF
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Backport from upstream:
|
|
https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4
|
|
]
|
|
---
|
|
src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------
|
|
1 file changed, 25 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 6521b20..c5b049f 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR})
|
|
set(lib_install_dir ${CMAKE_INSTALL_LIBDIR})
|
|
set(bin_install_dir ${CMAKE_INSTALL_BINDIR})
|
|
|
|
-add_library(pistache_shared SHARED $<TARGET_OBJECTS:pistache>)
|
|
-add_library(pistache_static STATIC $<TARGET_OBJECTS:pistache>)
|
|
+if (BUILD_SHARED_LIBS)
|
|
+ add_library(pistache_shared SHARED $<TARGET_OBJECTS:pistache>)
|
|
+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES})
|
|
+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE})
|
|
+endif ()
|
|
|
|
-target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES})
|
|
+add_library(pistache_static STATIC $<TARGET_OBJECTS:pistache>)
|
|
target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES})
|
|
-
|
|
-target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE})
|
|
target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE})
|
|
|
|
if (PISTACHE_USE_SSL)
|
|
target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL)
|
|
- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL)
|
|
target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL)
|
|
|
|
target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR})
|
|
- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto)
|
|
target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto)
|
|
+ if (BUILD_SHARED_LIBS)
|
|
+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL)
|
|
+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto)
|
|
+ endif ()
|
|
endif ()
|
|
|
|
set(Pistache_OUTPUT_NAME "pistache")
|
|
-set_target_properties(pistache_shared PROPERTIES
|
|
- OUTPUT_NAME ${Pistache_OUTPUT_NAME}
|
|
- VERSION ${version}
|
|
- SOVERSION ${VERSION_MAJOR}
|
|
-)
|
|
+if (BUILD_SHARED_LIBS)
|
|
+ set_target_properties(pistache_shared PROPERTIES
|
|
+ OUTPUT_NAME ${Pistache_OUTPUT_NAME}
|
|
+ VERSION ${version}
|
|
+ SOVERSION ${VERSION_MAJOR}
|
|
+ )
|
|
+endif ()
|
|
|
|
set_target_properties(pistache_static PROPERTIES
|
|
OUTPUT_NAME ${Pistache_OUTPUT_NAME}
|
|
@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL)
|
|
set(Pistache_CONFIG_FILE "PistacheConfig.cmake")
|
|
set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake")
|
|
|
|
- install(
|
|
- TARGETS pistache_shared
|
|
- EXPORT PistacheTargets
|
|
- ARCHIVE DESTINATION ${lib_install_dir}
|
|
- LIBRARY DESTINATION ${lib_install_dir}
|
|
- RUNTIME DESTINATION ${bin_install_dir}
|
|
- INCLUDES DESTINATION ${include_install_dir})
|
|
+ if (BUILD_SHARED_LIBS)
|
|
+ install(
|
|
+ TARGETS pistache_shared
|
|
+ EXPORT PistacheTargets
|
|
+ ARCHIVE DESTINATION ${lib_install_dir}
|
|
+ LIBRARY DESTINATION ${lib_install_dir}
|
|
+ RUNTIME DESTINATION ${bin_install_dir}
|
|
+ INCLUDES DESTINATION ${include_install_dir})
|
|
+ endif()
|
|
|
|
install(
|
|
DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache"
|
|
--
|
|
2.28.0
|
|
|