Mercurial > hg > orthanc

changeset 5478:2948c694352e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LSB on Debian 12: removed "--lsb-besteffort" and "-Wl,--no-undefined"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Dec 2023 16:38:11 +0100
parents 78f68ad10b69
children dc8e5c65be99
files OrthancFramework/Resources/CMake/Compiler.cmake OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/Compiler.cmake	Wed Dec 20 14:44:09 2023 +0100
+++ b/OrthancFramework/Resources/CMake/Compiler.cmake	Wed Dec 20 16:38:11 2023 +0100
@@ -124,12 +124,15 @@
     ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
     ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
 
-  if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND
+  if (NOT ${CMAKE_SYSTEM_VERSION} STREQUAL "LinuxStandardBase" AND
+      NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND
       NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     # The "--no-undefined" linker flag makes the shared libraries
     # (plugins ModalityWorklists and ServeFolders) fail to compile on
     # OpenBSD, and make the PostgreSQL plugin complain about missing
-    # "environ" global variable in FreeBSD
+    # "environ" global variable in FreeBSD. Furthermore, on Linux
+    # Standard Base running on Debian 12, the "-Wl,--no-undefined"
+    # breaks the compilation (added after Orthanc 1.12.2).
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
   endif()
--- a/OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake	Wed Dec 20 14:44:09 2023 +0100
+++ b/OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake	Wed Dec 20 16:38:11 2023 +0100
@@ -82,8 +82,8 @@
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -I${LSB_PATH}/include" CACHE INTERNAL "" FORCE)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -nostdinc++ -I${LSB_PATH}/include -I${LSB_PATH}/include/c++ -I${LSB_PATH}/include/c++/backward" CACHE INTERNAL "" FORCE)
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -L${LSB_LIBPATH} --lsb-besteffort" CACHE INTERNAL "" FORCE)
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -L${LSB_LIBPATH} --lsb-besteffort" CACHE INTERNAL "" FORCE)
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -L${LSB_LIBPATH}" CACHE INTERNAL "" FORCE)
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --lsb-target-version=${LSB_TARGET_VERSION} -L${LSB_LIBPATH}" CACHE INTERNAL "" FORCE)
 
 if (NOT "${LSB_CXX}" STREQUAL "")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --lsb-cxx=${LSB_CXX}")