diff options
| author | adam <adam@pkgsrc.org> | 2021-06-21 10:49:20 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-06-21 10:49:20 +0000 |
| commit | b9f80e56161ccc7a47903445b92e095b251ffa98 (patch) | |
| tree | 09bc3824e195499bc1997e9d748969c49d65db10 /math/qhull | |
| parent | 9e3c46bbf4ddc3fdf4d1a81a43a899621261f1d0 (diff) | |
| download | pkgsrc-b9f80e56161ccc7a47903445b92e095b251ffa98.tar.gz | |
qhull: install libqhull properly; fixes install_name on Darwin
Diffstat (limited to 'math/qhull')
| -rw-r--r-- | math/qhull/Makefile | 6 | ||||
| -rw-r--r-- | math/qhull/distinfo | 4 | ||||
| -rw-r--r-- | math/qhull/patches/patch-CMakeLists.txt | 23 |
3 files changed, 25 insertions, 8 deletions
diff --git a/math/qhull/Makefile b/math/qhull/Makefile index cfca408b1ff..351a1dee9dc 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2021/06/15 04:07:20 thor Exp $ +# $NetBSD: Makefile,v 1.10 2021/06/21 10:49:20 adam Exp $ DISTNAME= qhull-2020-src-${LIBVERSION} PKGNAME= qhull-2020.2 @@ -28,10 +28,8 @@ CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1 post-extract: rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh +# libqhull is deprecated post-build: cd ${WRKSRC} && make libqhull -post-install: - cp ${WRKSRC}/libqhull.* ${DESTDIR}${PREFIX}/lib/ - .include "../../mk/bsd.pkg.mk" diff --git a/math/qhull/distinfo b/math/qhull/distinfo index ec3d1f6c204..ea3d39c6842 100644 --- a/math/qhull/distinfo +++ b/math/qhull/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2021/02/07 15:23:47 adam Exp $ +$NetBSD: distinfo,v 1.9 2021/06/21 10:49:20 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 +SHA1 (patch-CMakeLists.txt) = 4bf55cf1dc9b29f8708b337967f86bbaffce3b91 diff --git a/math/qhull/patches/patch-CMakeLists.txt b/math/qhull/patches/patch-CMakeLists.txt index fefd7068346..98b5157b29a 100644 --- a/math/qhull/patches/patch-CMakeLists.txt +++ b/math/qhull/patches/patch-CMakeLists.txt @@ -1,9 +1,19 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2021/02/07 15:23:47 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2021/06/21 10:49:20 adam Exp $ +Also install libqhull. Fix library name on Darwin. ---- CMakeLists.txt.orig 2021-02-07 15:06:02.000000000 +0000 +--- CMakeLists.txt.orig 2020-09-04 01:23:31.000000000 +0000 +++ CMakeLists.txt +@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull a + + set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf) + set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR}) +-set(qhull_TARGETS_SHARED ${qhull_SHAREDR}) ++set(qhull_TARGETS_SHARED ${qhull_SHARED} ${qhull_SHAREDR}) + + set( + qhull_TARGETS_TEST # Unused @@ -370,8 +370,6 @@ set_target_properties(${qhull_SHAREDR} P if(UNIX) target_link_libraries(${qhull_SHAREDR} m) @@ -13,3 +23,12 @@ Fix library name on Darwin. else() set_target_properties(${qhull_SHAREDR} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}" +@@ -397,8 +395,6 @@ set_target_properties(${qhull_SHARED} PR + if(UNIX) + target_link_libraries(${qhull_SHARED} m) + if(APPLE) +- set_target_properties(${qhull_SHARED} PROPERTIES +- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") + else() + set_target_properties(${qhull_SHARED} PROPERTIES + INSTALL_RPATH "${LIB_INSTALL_DIR}" |