diff mbox series

[1/1] package/pistache: fix static build

Message ID 20201017135449.3459214-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/pistache: fix static build | expand

Commit Message

Fabrice Fontaine Oct. 17, 2020, 1:54 p.m. UTC
Don't build shared library with BR2_SHARED_LIBS=OFF to avoid the
following build failure:

[100%] Linking CXX shared library libpistache.so
make[3]: Leaving directory `/home/buildroot/autobuild/run/instance-1/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d'
[100%] Built target pistache_static
/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object

Fixes:
 - http://autobuild.buildroot.org/results/6cc/6cc76b3e76defa9b8154568a6ebcd6bf4cadd334/build-end.log

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch

Comments

Yann E. MORIN Oct. 18, 2020, 7:54 a.m. UTC | #1
Fabrice, All,

On 2020-10-17 15:54 +0200, Fabrice Fontaine spake thusly:
> Don't build shared library with BR2_SHARED_LIBS=OFF to avoid the
> following build failure:
> 
> [100%] Linking CXX shared library libpistache.so
> make[3]: Leaving directory `/home/buildroot/autobuild/run/instance-1/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d'
> [100%] Built target pistache_static
> /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/6cc/6cc76b3e76defa9b8154568a6ebcd6bf4cadd334/build-end.log
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, after updating the upstream status now they merged
your patch. Thanks!

Regards,
Yann E. MORIN.

> ---
>  ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 93 +++++++++++++++++++
>  1 file changed, 93 insertions(+)
>  create mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
> 
> diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
> new file mode 100644
> index 0000000000..6d3499c24d
> --- /dev/null
> +++ b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
> @@ -0,0 +1,93 @@
> +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>
> +[Upstream status: https://github.com/oktal/pistache/pull/828]
> +---
> + 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
> +
> -- 
> 2.28.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
new file mode 100644
index 0000000000..6d3499c24d
--- /dev/null
+++ b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
@@ -0,0 +1,93 @@ 
+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>
+[Upstream status: https://github.com/oktal/pistache/pull/828]
+---
+ 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
+