diff options
| author | bouyer <bouyer@pkgsrc.org> | 2017-08-24 13:01:32 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2017-08-24 13:01:32 +0000 |
| commit | a070fb3ef264550e7f9265b2bcd2a7ac6e7490d9 (patch) | |
| tree | fc134e4e3653bfd996ec930c47fff7d4748c1b6e /geography/opencpn-plugin-weather_routing | |
| parent | 5c70870df9cd2a2a6cb92f23f6c49f3525e26ec1 (diff) | |
| download | pkgsrc-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-weather_routing')
3 files changed, 14 insertions, 16 deletions
diff --git a/geography/opencpn-plugin-weather_routing/Makefile b/geography/opencpn-plugin-weather_routing/Makefile index 40477d806da..4df7e4d36eb 100644 --- a/geography/opencpn-plugin-weather_routing/Makefile +++ b/geography/opencpn-plugin-weather_routing/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2017/04/14 16:42:25 bouyer Exp $ +# $NetBSD: Makefile,v 1.13 2017/08/24 13:01:33 bouyer Exp $ # VERSION= 20170414 DISTNAME= weather_routing_pi-${VERSION} PKGNAME= opencpn-plugin-weather_routing-${VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/} GITHUB_PROJECT= weather_routing_pi diff --git a/geography/opencpn-plugin-weather_routing/distinfo b/geography/opencpn-plugin-weather_routing/distinfo index 651bd882e20..67f3177d5af 100644 --- a/geography/opencpn-plugin-weather_routing/distinfo +++ b/geography/opencpn-plugin-weather_routing/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2017/04/14 16:35:21 bouyer Exp $ +$NetBSD: distinfo,v 1.9 2017/08/24 13:01:33 bouyer Exp $ SHA1 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = e28c7831b923293a1e0d874150f038090979e181 RMD160 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 54d584a02d811c17626e4969817a44d03f3b93de SHA512 (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 20607b864eef999bfbf1b05f62661479eed484a4e1c407dac4605f703f59faf91f684acd34e078bbf3c89d6aca128000f3d6fd45e7f767f16fd888382e15f0bd Size (weather_routing_pi-20170414-d65c968479af4fee78aa28b4b3f2c54660597eac.tar.gz) = 847684 bytes -SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439 +SHA1 (patch-cmake_PluginConfigure.cmake) = 5f0b145d34c064870090eaa598b5474020eb887d SHA1 (patch-src_Polar.cpp) = fa7af26e0dcba1dda3ae358c35353c6304d4f941 SHA1 (patch-src_RouteMap.cpp) = a733a901f04eeb1699805e590325c0485ce26d1b SHA1 (patch-src_RouteMapOverlay.cpp) = 075ca5206f03e83277060bae1776ba77d26bd990 diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake b/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake index 004b0c89aa6..adb6dcaa213 100644 --- a/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake +++ b/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake @@ -1,19 +1,17 @@ -$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.1 2016/03/14 11:07:59 bouyer Exp $ +$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2017/08/24 13:01:33 bouyer Exp $ Do not overwrite CMAKE_SHARED_LINKER_FLAGS ---- cmake/PluginConfigure.cmake.orig 2016-02-10 19:43:27.000000000 +0100 -+++ cmake/PluginConfigure.cmake 2016-02-10 19:43:46.000000000 +0100 -@@ -43,11 +43,9 @@ - ENDIF(DEBUG) +--- cmake/PluginConfigure.cmake.orig 2017-04-01 02:46:48.000000000 +0200 ++++ cmake/PluginConfigure.cmake 2017-08-24 11:54:54.830898473 +0200 +@@ -44,9 +44,9 @@ ENDIF(PROFILING) -- IF(NOT APPLE) + IF(NOT APPLE) - SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") -- ELSE(NOT APPLE) -+ 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) - |