pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mpdecimal: fix dylib install name on Darwin; cleanup
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Sun Dec 22 09:04:41 2024 +0100
Changeset: 8f5a84786c50ea76c4afbcf56744f714b1b2ac21
Modified Files:
mpdecimal/Makefile
mpdecimal/buildlink3.mk
mpdecimal/distinfo
Added Files:
mpdecimal/patches/patch-configure
Log Message:
mpdecimal: fix dylib install name on Darwin; cleanup
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8f5a84786c50ea76c4afbcf56744f714b1b2ac21
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mpdecimal/Makefile | 12 +++++-------
mpdecimal/buildlink3.mk | 2 +-
mpdecimal/distinfo | 1 +
mpdecimal/patches/patch-configure | 24 ++++++++++++++++++++++++
4 files changed, 31 insertions(+), 8 deletions(-)
diffs:
diff --git a/mpdecimal/Makefile b/mpdecimal/Makefile
index 4485c6dcf0..98ce5dec0e 100644
--- a/mpdecimal/Makefile
+++ b/mpdecimal/Makefile
@@ -9,17 +9,15 @@ HOMEPAGE= https://www.bytereef.org/mpdecimal/
COMMENT= C/C++ arbitrary precision decimal floating point libraries
LICENSE= 2-clause-bsd
-GNU_CONFIGURE= yes
+USE_CC_FEATURES= c99
+USE_CXX_FEATURES= c++11
USE_LANGUAGES= c c++
-USE_CC_FEATURES+= c99
-
USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
BUILD_TARGET= default
TEST_TARGET= check_local
-
-# so that libmpdec++.so find libmpdec.so
-CONFIGURE_ARGS+= LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib" LDXXFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
-
+# Let libmpdec++.so find libmpdec.so
+CONFIGURE_ENV+= LDXXFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
PKGCONFIG_OVERRIDE+= libmpdec/.pc/libmpdec.pc.in
PKGCONFIG_OVERRIDE+= libmpdec++/.pc/libmpdec++.pc.in
diff --git a/mpdecimal/buildlink3.mk b/mpdecimal/buildlink3.mk
index 6043a4b106..d18aadbe1f 100644
--- a/mpdecimal/buildlink3.mk
+++ b/mpdecimal/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= mpdecimal
MPDECIMAL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mpdecimal+= mpdecimal>=4.0.0
-BUILDLINK_PKGSRCDIR.mpdecimal?= ../../wip/mpdecimal
+BUILDLINK_PKGSRCDIR.mpdecimal?= ../../wip/mpdecimal
.endif # MPDECIMAL_BUILDLINK3_MK
BUILDLINK_TREE+= -mpdecimal
diff --git a/mpdecimal/distinfo b/mpdecimal/distinfo
index 9b6397a5b1..5ffa4ce366 100644
--- a/mpdecimal/distinfo
+++ b/mpdecimal/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
BLAKE2s (mpdecimal-4.0.0.tar.gz) = 02a10248bfe5df47a25edde34604c7b26c8e51429e57992cd0e459c605591d6b
SHA512 (mpdecimal-4.0.0.tar.gz) = 7610ac53ac79f7a8a33fa7a3e61515810444ec73ebca859df7a9ddc18e96b990c99323172810c9cc7f6d6e1502c0be308cd443d6c2d5d0c871648e4842e05d59
Size (mpdecimal-4.0.0.tar.gz) = 315325 bytes
+SHA1 (patch-configure) = 202dca254c5e015d8364f29584d45e1c06440c92
diff --git a/mpdecimal/patches/patch-configure b/mpdecimal/patches/patch-configure
new file mode 100644
index 0000000000..f98a40a607
--- /dev/null
+++ b/mpdecimal/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix dynamic library install name on Darwin.
+
+--- configure.orig 2024-12-22 07:39:18.885702870 +0000
++++ configure
+@@ -2843,7 +2843,7 @@ case $host in
+ LIBNAME="libmpdec.dylib"
+ LIBSONAME="libmpdec.4.dylib"
+ LIBSHARED="libmpdec.4.0.0.dylib"
+- CONFIGURE_LDFLAGS="-dynamiclib $FPIC -install_name @rpath/$LIBSONAME -compatibility_version 4.0 -current_version 4.0.0"
++ CONFIGURE_LDFLAGS="-dynamiclib $FPIC -install_name ${PREFIX}/lib/$LIBSONAME -compatibility_version 4.0 -current_version 4.0.0"
+ ;;
+ *-*-aix*)
+ LIBNAME=
+@@ -2887,7 +2887,7 @@ case $host in
+ LIBNAME_CXX="libmpdec++.dylib"
+ LIBSONAME_CXX="libmpdec++.4.dylib"
+ LIBSHARED_CXX="libmpdec++.4.0.0.dylib"
+- CONFIGURE_LDXXFLAGS="-dynamiclib $FPIC -install_name @rpath/$LIBSONAME_CXX -compatibility_version 4.0 -current_version 4.0.0"
++ CONFIGURE_LDXXFLAGS="-dynamiclib $FPIC -install_name ${PREFIX}/lib/$LIBSONAME_CXX -compatibility_version 4.0 -current_version 4.0.0"
+ ;;
+ *-*-aix*)
+ LIBNAME_CXX=
Home |
Main Index |
Thread Index |
Old Index