details: https://anonhg.NetBSD.org/pkgsrc/rev/22debe4e9d18
branches: trunk
changeset: 446354:22debe4e9d18
user: adam <adam%pkgsrc.org@localhost>
date: Sun Feb 07 15:23:47 2021 +0000
description:
qhull: fix library name on Darwin
diffstat:
math/qhull/Makefile | 12 +++++-------
math/qhull/distinfo | 3 ++-
math/qhull/patches/patch-CMakeLists.txt | 15 +++++++++++++++
3 files changed, 22 insertions(+), 8 deletions(-)
diffs (62 lines):
diff -r 10f56d42fbc6 -r 22debe4e9d18 math/qhull/Makefile
--- a/math/qhull/Makefile Sun Feb 07 14:32:46 2021 +0000
+++ b/math/qhull/Makefile Sun Feb 07 15:23:47 2021 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/01/23 23:19:16 gdt Exp $
-
-
+# $NetBSD: Makefile,v 1.8 2021/02/07 15:23:47 adam Exp $
DISTNAME= qhull-2020-src-8.0.2
PKGNAME= qhull-2020.2
@@ -14,10 +12,6 @@
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-# Remove non-portable file not used in build or test.
-post-extract:
- rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh
-
USE_CMAKE= yes
USE_LANGUAGES= c c++
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
@@ -25,4 +19,8 @@
CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1
+# Remove non-portable file not used in build or test.
+post-extract:
+ rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh
+
.include "../../mk/bsd.pkg.mk"
diff -r 10f56d42fbc6 -r 22debe4e9d18 math/qhull/distinfo
--- a/math/qhull/distinfo Sun Feb 07 14:32:46 2021 +0000
+++ b/math/qhull/distinfo Sun Feb 07 15:23:47 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/01/23 23:19:16 gdt Exp $
+$NetBSD: distinfo,v 1.8 2021/02/07 15:23:47 adam Exp $
SHA1 (qhull-2020-src-8.0.2.tgz) = 2dbc240919560ac008a92363984754a70677b353
RMD160 (qhull-2020-src-8.0.2.tgz) = c407ff5f09edefe093d69349fe4476a62ca7a982
SHA512 (qhull-2020-src-8.0.2.tgz) = 63d42442f1444ddb09a09680bfdb4d4ffd54295add31f19ec977c1a5bd02a74665f57fdb8503c882720a317cf741c8511b458dcc1ae0930cabe08069ba1496fd
Size (qhull-2020-src-8.0.2.tgz) = 1298874 bytes
+SHA1 (patch-CMakeLists.txt) = da53c23d845c790f0fa69464a2e14410419c6827
diff -r 10f56d42fbc6 -r 22debe4e9d18 math/qhull/patches/patch-CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/qhull/patches/patch-CMakeLists.txt Sun Feb 07 15:23:47 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2021/02/07 15:23:47 adam Exp $
+
+Fix library name on Darwin.
+
+--- CMakeLists.txt.orig 2021-02-07 15:06:02.000000000 +0000
++++ CMakeLists.txt
+@@ -370,8 +370,6 @@ set_target_properties(${qhull_SHAREDR} P
+ if(UNIX)
+ target_link_libraries(${qhull_SHAREDR} m)
+ if(APPLE)
+- set_target_properties(${qhull_SHAREDR} PROPERTIES
+- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
+ else()
+ set_target_properties(${qhull_SHAREDR} PROPERTIES
+ INSTALL_RPATH "${LIB_INSTALL_DIR}"