summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/itk-1-fixes.patch37
-rw-r--r--src/itk-1-gdmcsocket.patch26
2 files changed, 37 insertions, 26 deletions
diff --git a/src/itk-1-fixes.patch b/src/itk-1-fixes.patch
new file mode 100644
index 0000000..8105c78
--- /dev/null
+++ b/src/itk-1-fixes.patch
@@ -0,0 +1,37 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rashad Kanavath <rashad.kanavath@c-s.fr>
+Date: Wed, 2 Dec 2015 15:00:54 +0100
+Subject: [PATCH] fix shared build
+
+
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
+@@ -6,6 +6,8 @@ set(PACKAGE "socket++")
+ include(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
+
++add_definitions(-Dsocketxx_EXPORTS)
++
+ # specific
+ if(WIN32)
+ else()
+@@ -67,6 +69,8 @@ if(UNIX)
+ )
+ endif()
+
++set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
++
+ add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
+ set_target_properties (${SOCKETXX_LIBRARY_NAME}
+ PROPERTIES DEFINE_SYMBOL "socketxx_EXPORTS" )
+@@ -105,4 +109,3 @@ if(NOT SOCKETXX_INSTALL_NO_DEVELOPMENT)
+ DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
+ )
+ endif()
+-
diff --git a/src/itk-1-gdmcsocket.patch b/src/itk-1-gdmcsocket.patch
deleted file mode 100644
index ac656a5..0000000
--- a/src/itk-1-gdmcsocket.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -burN InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
---- InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt 2015-12-02 13:19:53.030344390 +0100
-+++ InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt 2015-12-02 13:32:36.094384138 +0100
-@@ -6,6 +6,8 @@
- include(CheckFunctionExists)
- CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
-
-+add_definitions(-Dsocketxx_EXPORTS)
-+
- # specific
- if(WIN32)
- else()
-@@ -67,6 +69,8 @@
- )
- endif()
-
-+set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-+
- add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
- if(WIN32)
- target_link_libraries(${SOCKETXX_LIBRARY_NAME} ws2_32.lib)
-@@ -103,4 +107,3 @@
- DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
- )
- endif()
--