pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/geography/opencpn-plugin-plots Do not overwrite CMAKE_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95ded1de8df4
branches:  trunk
changeset: 385850:95ded1de8df4
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Tue Sep 27 10:04:39 2022 +0000

description:
Do not overwrite CMAKE_SHARED_LINKER_FLAGS, bump PKGREVISION
Should fix missing rpaths, which shows up with PKG_DEVELOPER=yes,
reported by wiz@

diffstat:

 geography/opencpn-plugin-plots/Makefile                                  |   4 +-
 geography/opencpn-plugin-plots/distinfo                                  |   3 +-
 geography/opencpn-plugin-plots/patches/patch-cmake_PluginConfigure.cmake |  15 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 41febba5197c -r 95ded1de8df4 geography/opencpn-plugin-plots/Makefile
--- a/geography/opencpn-plugin-plots/Makefile   Tue Sep 27 08:46:32 2022 +0000
+++ b/geography/opencpn-plugin-plots/Makefile   Tue Sep 27 10:04:39 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/08/11 05:08:37 gutteridge Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/27 10:04:39 bouyer Exp $
 #
 
 VERSION=       2.2.12
-PKGREVISION=   2
+PKGREVISION=   3
 DISTNAME=      ocpn_plots_pi-${VERSION}
 PKGNAME=       opencpn-plugin-plots-${VERSION}
 CATEGORIES=    geography
diff -r 41febba5197c -r 95ded1de8df4 geography/opencpn-plugin-plots/distinfo
--- a/geography/opencpn-plugin-plots/distinfo   Tue Sep 27 08:46:32 2022 +0000
+++ b/geography/opencpn-plugin-plots/distinfo   Tue Sep 27 10:04:39 2022 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2022/04/04 21:14:51 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2022/09/27 10:04:39 bouyer Exp $
 
 BLAKE2s (ocpn_plots_pi-2.2.12.tar.gz) = 3e34c9c075351a38bad983a784b5faee10b863a107d542b2bb21f4766314667e
 SHA512 (ocpn_plots_pi-2.2.12.tar.gz) = fb2bb19da0866f08835b82c76e9b14c042aab531230f4398db9b912733446e9ab1e9c52804f2d8698de6c0b496a67645a89e60f2234587b7d5e0cb001b0d9304
 Size (ocpn_plots_pi-2.2.12.tar.gz) = 921352 bytes
+SHA1 (patch-cmake_PluginConfigure.cmake) = 89c8e0e607edf7afe7af2e839c824d748b40c34f
 SHA1 (patch-cmake_PluginSetup.cmake) = 5cd62f288bea7993da60ff58af01b4c427afa99f
 SHA1 (patch-src_icons.cpp) = 4c3e9e5b2317dfda9a7c68610a7b6dd0b83a1a1c
 SHA1 (patch-src_plots_pi.cpp) = d26ef2ba3c08c78cb4abb6b7a4f041d3281c5689
diff -r 41febba5197c -r 95ded1de8df4 geography/opencpn-plugin-plots/patches/patch-cmake_PluginConfigure.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/opencpn-plugin-plots/patches/patch-cmake_PluginConfigure.cmake  Tue Sep 27 10:04:39 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.1 2022/09/27 10:04:39 bouyer Exp $
+Do not overwrite CMAKE_SHARED_LINKER_FLAGS
+
+--- cmake/PluginConfigure.cmake.orig   2022-09-27 11:57:14.210931921 +0200
++++ cmake/PluginConfigure.cmake        2022-09-27 11:57:29.413310899 +0200
+@@ -228,9 +228,6 @@
+ 
+ include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
+ 
+-set(CMAKE_SHARED_LINKER_FLAGS "")
+-set(CMAKE_EXE_LINKER_FLAGS "")
+-
+ # SET(PROFILING 1)
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+     add_definitions("-DDEBUG_BUILD")



Home | Main Index | Thread Index | Old Index