diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-19 21:57:42 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-19 21:57:42 +0000 |
| commit | 80fa809e786ddb70ab2f0e8c1fa61a3bcc52fdae (patch) | |
| tree | 09fa86c183795bebcee508003a5b1496ade264dd /math/R | |
| parent | 4734f3dbc25abee058d1ec11d27c8d6c19c4a755 (diff) | |
| download | pkgsrc-80fa809e786ddb70ab2f0e8c1fa61a3bcc52fdae.tar.gz | |
Fix more library install names on Darwin.
Diffstat (limited to 'math/R')
| -rw-r--r-- | math/R/Makefile | 10 | ||||
| -rw-r--r-- | math/R/distinfo | 4 | ||||
| -rw-r--r-- | math/R/patches/patch-ac | 18 |
3 files changed, 20 insertions, 12 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index edf42357223..fc3d5fe4fec 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.162 2015/09/11 13:16:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.163 2016/02/19 21:57:42 jperkin Exp $ DISTNAME= R-3.2.2 CATEGORIES= math @@ -144,16 +144,10 @@ CONFIGURE_ARGS+= --enable-mbcs=no .PHONY: fix-darwin-install-name post-install: fix-darwin-install-name fix-darwin-install-name: - install_name_tool -id ${PREFIX}/lib/R/lib/libR.dylib \ - ${DESTDIR}${PREFIX}/lib/R/lib/libR.dylib - install_name_tool -id ${PREFIX}/lib/R/lib/libRlapack.dylib \ - ${DESTDIR}${PREFIX}/lib/R/lib/libRlapack.dylib ${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do \ libname=`basename $${lib}`; \ libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \ - install_name_tool -id $${libdir}/$${libname} \ - -change libR.dylib \ - ${PREFIX}/lib/R/lib/libR.dylib $${lib}; \ + install_name_tool -id $${libdir}/$${libname} $${lib}; \ done .endif diff --git a/math/R/distinfo b/math/R/distinfo index 8b270b4678a..7daf6f222db 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.70 2015/11/03 23:33:26 agc Exp $ +$NetBSD: distinfo,v 1.71 2016/02/19 21:57:42 jperkin Exp $ SHA1 (R-3.2.2.tar.gz) = 68c74db1c5a2f2040280a03b8396e4d28a5a7617 RMD160 (R-3.2.2.tar.gz) = 0e8bf2ecca48f0f2433f6b07f422b7730a76fbb4 SHA512 (R-3.2.2.tar.gz) = 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 Size (R-3.2.2.tar.gz) = 29772864 bytes -SHA1 (patch-ac) = 1dc842ca867a1efa4f757ec5cbdca68a6957dd55 +SHA1 (patch-ac) = b6fc368714a3c962d343d68dedda2347063b6c83 SHA1 (patch-ad) = 0a08f293bc1cdc130047868e5d574c2df1f4c6cf SHA1 (patch-src_include_GraphicsBase.h) = 5f999e4d124afd38d5c7e18d936942f2c6f27c86 SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8 diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index dc2deccd5cd..c5dc97d4705 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.36 2015/08/14 12:40:19 wen Exp $ +$NetBSD: patch-ac,v 1.37 2016/02/19 21:57:42 jperkin Exp $ Do not include system paths in R_LD_LIBRARY_PATH. FreeBSD 10 is not FreeBSD 1. Fix texi2any version check. ---- configure.orig 2015-08-14 19:37:48.000000000 +0000 +--- configure.orig 2015-08-13 09:21:16.000000000 +0000 +++ configure @@ -4012,7 +4012,7 @@ fi @@ -142,6 +142,20 @@ Fix texi2any version check. ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5 +@@ -26723,10 +26740,10 @@ case "${host_os}" in + DYLIB_EXT=".dylib" + dylib_ldflags="${darwin_dylib_ldflags}" + MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"` +- LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" +- RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" ++ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" ++ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" + ## don't use version in libRblas so we can replace it with any BLAS implementation +- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names" ++ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names" + ;; + hpux*) + ## Needs to avoid embedding a relative path ../../../bin. @@ -27320,6 +27337,14 @@ _ACEOF ## Cygwin has rintl but not nearbyintl for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl |