Tue Apr 18 13:31:55 2017 UTC ()
Fix build for non-x86 hosts (don't assume non-linux is i386!)


(bouyer)
diff -r1.11 -r1.12 pkgsrc/geography/opencpn/distinfo
diff -r1.5 -r1.6 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
cvs diff -r1.11 -r1.12 pkgsrc/geography/opencpn/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/distinfo 2017/04/14 16:20:15 1.11
+++ pkgsrc/geography/opencpn/distinfo 2017/04/18 13:31:55 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.11 2017/04/14 16:20:15 bouyer Exp $ 1$NetBSD: distinfo,v 1.12 2017/04/18 13:31:55 bouyer Exp $
2 2
3SHA1 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = e977ab8292c2ec5836eea2dce7257f60d0d4ad52 3SHA1 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = e977ab8292c2ec5836eea2dce7257f60d0d4ad52
4RMD160 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = eb840b5d694f17ae12caa7d08134986d6d143acf 4RMD160 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = eb840b5d694f17ae12caa7d08134986d6d143acf
5SHA512 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 8ef95ee173084d91d54651c13e155112df88ce87c32d5124695da0a4507a2650f3e0094cea3287a750c8f90fd9f6240d8ab4faf665d9b15cbbcebcc131ea8efa 5SHA512 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 8ef95ee173084d91d54651c13e155112df88ce87c32d5124695da0a4507a2650f3e0094cea3287a750c8f90fd9f6240d8ab4faf665d9b15cbbcebcc131ea8efa
6Size (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 55864452 bytes 6Size (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 55864452 bytes
7SHA1 (patch-CMakeLists.txt) = 90c44c4bcc55c360a0553193c975223e8bf6ad25 7SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14
8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a 8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85 9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65 10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e 11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e
12SHA1 (patch-plugins_demo_pi_sample_CMakeLists.txt) = 6fde2dae588e0d8250bd1e0d60a465fb20d9a599 12SHA1 (patch-plugins_demo_pi_sample_CMakeLists.txt) = 6fde2dae588e0d8250bd1e0d60a465fb20d9a599
13SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49 13SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
14SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046 14SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
15SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a 15SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62 18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb 19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
20SHA1 (patch-src_printtable.cpp) = 940e7f42dd7e6a9776db2009027989ca79429cb1 20SHA1 (patch-src_printtable.cpp) = 940e7f42dd7e6a9776db2009027989ca79429cb1
cvs diff -r1.5 -r1.6 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt 2017/04/14 16:20:15 1.5
+++ pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt 2017/04/18 13:31:55 1.6
@@ -1,35 +1,58 @@ @@ -1,35 +1,58 @@
1$NetBSD: patch-CMakeLists.txt,v 1.5 2017/04/14 16:20:15 bouyer Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.6 2017/04/18 13:31:55 bouyer Exp $
2 2
3--- CMakeLists.txt.orig 2017-04-02 05:17:09.000000000 +0200 3--- CMakeLists.txt.orig 2017-04-02 05:17:09.000000000 +0200
4+++ CMakeLists.txt 2017-04-14 13:06:55.000000000 +0200 4+++ CMakeLists.txt 2017-04-18 15:03:46.000000000 +0200
5@@ -99,7 +99,6 @@ 5@@ -65,8 +65,21 @@
 6 # Based on code from nohal
 7 IF (NOT WIN32)
 8 # default
 9- SET (ARCH "i386")
 10+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
 11+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
 12+ SET (ARCH "aarch64")
 13+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
 14+ SET (ARCH "armhf")
 15+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
 16+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
 17+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
 18+ SET (ARCH "x86_64")
 19+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
 20+ SET (ARCH "i386")
 21+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
 22+ ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
 23 SET (LIB_INSTALL_DIR "lib")
 24+
 25 IF (EXISTS /etc/debian_version)
 26 SET (PACKAGE_FORMAT "DEB")
 27 SET (PACKAGE_DEPS "libc6, libwxgtk3.0-0, wx3.0-i18n, libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2, libtinyxml2.6.2, libportaudio2")
 28@@ -99,7 +112,6 @@
6 ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") 29 ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
7 IF (CMAKE_SIZEOF_VOID_P MATCHES "8") 30 IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
8 SET (ARCH "x86_64") 31 SET (ARCH "x86_64")
9- SET (LIB_INSTALL_DIR "lib64") 32- SET (LIB_INSTALL_DIR "lib64")
10 ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") 33 ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
11 SET (ARCH "i386") 34 SET (ARCH "i386")
12 SET (LIB_INSTALL_DIR "lib") 35 SET (LIB_INSTALL_DIR "lib")
13@@ -318,7 +317,7 @@ 36@@ -318,7 +330,7 @@
14  37
15 # Search for opengles, short of running a program to test the speed 38 # Search for opengles, short of running a program to test the speed
16 # of acceleration, I simply use gles on "native linux" arm systems 39 # of acceleration, I simply use gles on "native linux" arm systems
17-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) ) 40-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) )
18+IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" ) 41+IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" )
19 find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h ) 42 find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
20 IF (OPENGLESv1_INCLUDE_DIR) 43 IF (OPENGLESv1_INCLUDE_DIR)
21 MESSAGE (STATUS "Found OpenGLESv1") 44 MESSAGE (STATUS "Found OpenGLESv1")
22@@ -1861,10 +1860,10 @@ 45@@ -1861,10 +1873,10 @@
23  46
24 # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries 47 # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries
25 # So, add them manually. These declarations may be redundant in some architectures, but do no harm. 48 # So, add them manually. These declarations may be redundant in some architectures, but do no harm.
26-IF(UNIX) 49-IF(UNIX)
27-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) 50-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
28-ENDIF(UNIX) 51-ENDIF(UNIX)
29- 52-
30+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") 53+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
31+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) 54+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
32+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic") 55+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
33+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") 56+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
34  57
35 IF( UNIX AND NOT APPLE ) 58 IF( UNIX AND NOT APPLE )