summaryrefslogtreecommitdiff
path: root/geography/opencpn-plugin-watchdog
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2017-08-24 13:01:32 +0000
committerbouyer <bouyer@pkgsrc.org>2017-08-24 13:01:32 +0000
commita070fb3ef264550e7f9265b2bcd2a7ac6e7490d9 (patch)
treefc134e4e3653bfd996ec930c47fff7d4748c1b6e /geography/opencpn-plugin-watchdog
parent5c70870df9cd2a2a6cb92f23f6c49f3525e26ec1 (diff)
downloadpkgsrc-a070fb3ef264550e7f9265b2bcd2a7ac6e7490d9.tar.gz
We need -Wl,-Bsymbolic in the linker flags for NetBSD too, not only linux.
The reason is that a plugin may include its private version of some code that opencpn also has in its source. Without -Bsymbolic the plugin may use the objects from opencpn instead of its version, and which do not match the includes it was compiled with, and bad things happens. bump PKGREVISIONs
Diffstat (limited to 'geography/opencpn-plugin-watchdog')
-rw-r--r--geography/opencpn-plugin-watchdog/Makefile4
-rw-r--r--geography/opencpn-plugin-watchdog/distinfo4
-rw-r--r--geography/opencpn-plugin-watchdog/patches/patch-cmake_PluginConfigure.cmake26
3 files changed, 14 insertions, 20 deletions
diff --git a/geography/opencpn-plugin-watchdog/Makefile b/geography/opencpn-plugin-watchdog/Makefile
index 796753acd15..4a4bd7cbbaf 100644
--- a/geography/opencpn-plugin-watchdog/Makefile
+++ b/geography/opencpn-plugin-watchdog/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2017/07/07 13:04:36 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2017/08/24 13:01:33 bouyer Exp $
#
VERSION= 20170611
DISTNAME= watchdog_pi-${VERSION}
PKGNAME= opencpn-plugin-watchdog-${VERSION}
-#PKGREVISION= 3
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= watchdog_pi
diff --git a/geography/opencpn-plugin-watchdog/distinfo b/geography/opencpn-plugin-watchdog/distinfo
index 3fd4c49eb9e..034fcbc0557 100644
--- a/geography/opencpn-plugin-watchdog/distinfo
+++ b/geography/opencpn-plugin-watchdog/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2017/07/07 13:04:36 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2017/08/24 13:01:33 bouyer Exp $
SHA1 (watchdog_pi-20170611-870a9231cd451b24d876097166e95ab4a55122ce.tar.gz) = d3dc5d109ca144eea81e367f2ec279fc9e44daae
RMD160 (watchdog_pi-20170611-870a9231cd451b24d876097166e95ab4a55122ce.tar.gz) = c8bbccaa090bfff9670333f1e4459da015d3cfc0
SHA512 (watchdog_pi-20170611-870a9231cd451b24d876097166e95ab4a55122ce.tar.gz) = a5f742e51272d92e3499ec0d86a65cf2ee5be4a82560ac5db4cf8d871b7aa1b80ba585899b57957a1f67b16ec8b40ce3db13354f96301b36ed2521a157ec3e0a
Size (watchdog_pi-20170611-870a9231cd451b24d876097166e95ab4a55122ce.tar.gz) = 447611 bytes
-SHA1 (patch-cmake_PluginConfigure.cmake) = 72713695893417f0e56fa78c624295fc0ca39470
+SHA1 (patch-cmake_PluginConfigure.cmake) = bc2d6409f95cffee145173280c33f9e7fe439864
diff --git a/geography/opencpn-plugin-watchdog/patches/patch-cmake_PluginConfigure.cmake b/geography/opencpn-plugin-watchdog/patches/patch-cmake_PluginConfigure.cmake
index 269cfa2424f..5cd4dcea2b7 100644
--- a/geography/opencpn-plugin-watchdog/patches/patch-cmake_PluginConfigure.cmake
+++ b/geography/opencpn-plugin-watchdog/patches/patch-cmake_PluginConfigure.cmake
@@ -1,23 +1,17 @@
-$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2016/05/21 10:50:41 bouyer Exp $
+$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.3 2017/08/24 13:01:33 bouyer Exp $
Do not overwrite CMAKE_SHARED_LINKER_FLAGS
---- cmake/PluginConfigure.cmake.orig 2016-04-13 23:56:21.000000000 +0200
-+++ cmake/PluginConfigure.cmake 2016-05-21 12:26:00.398634165 +0200
-@@ -40,11 +40,13 @@
- ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O0 -fexceptions" )
+--- cmake/PluginConfigure.cmake.orig 2017-06-11 14:59:39.000000000 +0200
++++ cmake/PluginConfigure.cmake 2017-08-24 11:52:45.287937243 +0200
+@@ -41,9 +41,9 @@
ENDIF(PROFILING)
-- IF(NOT APPLE)
+ 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)
-+ ENDIF(APPLE)
++ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
+ ELSE(NOT APPLE)
+- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
++ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl -undefined dynamic_lookup")
+ ENDIF(NOT APPLE)
ENDIF(NOT MSVC)
-