[med-svn] r19305 - trunk/packages/orthanc/trunk/debian/patches

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-06-04 07:18:09 +0000 (Thu, 04 Jun 2015)
New Revision: 19305

Added:
   trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage
Modified:
   trunk/packages/orthanc/trunk/debian/patches/series
Log:
add the --as-needed linker flag to the ServeFolders plugin

Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series	2015-06-03 21:58:23 UTC (rev 19304)
+++ trunk/packages/orthanc/trunk/debian/patches/series	2015-06-04 07:18:09 UTC (rev 19305)
@@ -1,2 +1,3 @@
 cmake-serve-folders
 remove-jquery-version
+serve-folders-linkage

Added: trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage	2015-06-04 07:18:09 UTC (rev 19305)
@@ -0,0 +1,58 @@
+Description: Add the "--as-needed" flag when linking the ServeFolders plugin
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.9.0/Resources/CMake/Compiler.cmake
+===================================================================
+--- Orthanc-0.9.0.orig/Resources/CMake/Compiler.cmake
++++ Orthanc-0.9.0/Resources/CMake/Compiler.cmake
+@@ -1,6 +1,12 @@
+ # This file sets all the compiler-related flags
+ 
+-if (${CMAKE_COMPILER_IS_GNUCXX})
++if (CMAKE_CROSSCOMPILING)
++  # Cross-compilation necessarily implies standalone and static build
++  SET(STATIC_BUILD ON)
++  SET(STANDALONE_BUILD ON)
++endif()
++
++if (CMAKE_COMPILER_IS_GNUCXX)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration")  
+   # --std=c99 makes libcurl not to compile
+   # -pedantic gives a lot of warnings on OpenSSL 
+@@ -11,7 +17,7 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
+     set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I<CMAKE_CURRENT_SOURCE_DIR> <SOURCE> <OBJECT>")
+   endif()
+ 
+-elseif (${MSVC})
++elseif (MSVC)
+   # Use static runtime under Visual Studio
+   # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
+   # http://stackoverflow.com/a/6510446
+@@ -53,6 +59,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
+ 
+   if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
++    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
++    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+     add_definitions(
+       -D_LARGEFILE64_SOURCE=1 
+       -D_FILE_OFFSET_BITS=64
+@@ -67,7 +75,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Wi
+     )
+   link_libraries(rpcrt4 ws2_32)
+ 
+-  if (${CMAKE_COMPILER_IS_GNUCXX})
++  if (CMAKE_COMPILER_IS_GNUCXX)
+     # This is a patch for MinGW64
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--allow-multiple-definition -static-libgcc -static-libstdc++")
+ 
+@@ -118,7 +126,7 @@ if (NOT HAVE_UUID_H)
+ endif()
+ 
+ 
+-if (${STATIC_BUILD})
++if (STATIC_BUILD)
+   add_definitions(-DORTHANC_STATIC=1)
+ else()
+   add_definitions(-DORTHANC_STATIC=0)