diff options
Diffstat (limited to 'geography/opencpn-plugin-draw/patches')
| -rw-r--r-- | geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake | 10 | ||||
| -rw-r--r-- | geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake | 20 |
2 files changed, 27 insertions, 3 deletions
diff --git a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake index 583b0e53c67..9a8920e40bc 100644 --- a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake +++ b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake @@ -1,15 +1,19 @@ -$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.1 2016/04/24 10:21:54 bouyer Exp $ +$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2016/05/21 10:50:41 bouyer Exp $ Do not overwrite CMAKE_SHARED_LINKER_FLAGS --- cmake/PluginConfigure.cmake.orig 2016-04-13 08:28:11.000000000 +0200 -+++ cmake/PluginConfigure.cmake 2016-04-15 16:03:44.000000000 +0200 -@@ -45,11 +45,9 @@ ++++ cmake/PluginConfigure.cmake 2016-05-21 12:20:47.579936156 +0200 +@@ -45,11 +45,13 @@ # ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" ) ENDIF(PROFILING) - IF(NOT APPLE) - SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") - ELSE(NOT APPLE) ++ IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") ++ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic") ++ ADD_DEFINITIONS( "-fPIC") ++ ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + IF(APPLE) SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup") - ENDIF(NOT APPLE) diff --git a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake new file mode 100644 index 00000000000..8a061efe7db --- /dev/null +++ b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake @@ -0,0 +1,20 @@ +$NetBSD: patch-cmake_PluginInstall.cmake,v 1.1 2016/05/21 10:50:41 bouyer Exp $ + +--- cmake/PluginInstall.cmake.orig 2016-04-13 08:28:11.000000000 +0200 ++++ cmake/PluginInstall.cmake 2016-05-21 12:20:58.903393680 +0200 +@@ -85,7 +85,6 @@ + # SET (PACKAGE_DEPS "wxGTK mesa-libGLU mesa-libGL gettext zlib bzip2 portaudio") + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "x86_64") +- SET (LIB_INSTALL_DIR "lib64") + ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "i386") + SET (LIB_INSTALL_DIR "lib") +@@ -96,7 +95,6 @@ + # SET (PACKAGE_DEPS "libwx_baseu-2_8-0-wxcontainer MesaGLw libbz2-1 portaudio") + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "x86_64") +- SET (LIB_INSTALL_DIR "lib64") + ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "i386") + SET (LIB_INSTALL_DIR "lib") |