diff options
| author | jperkin <jperkin> | 2014-01-09 13:52:41 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-01-09 13:52:41 +0000 |
| commit | f89b5b5e8dde727c8c8f1ee7f25454654ee5f5eb (patch) | |
| tree | 283ebe1e3ba7b70fbe833947e39262649fba2543 /math/R | |
| parent | d9f05fcf96a5502cfff3eb3d7fe94fbcad0da29c (diff) | |
| download | pkgsrc-f89b5b5e8dde727c8c8f1ee7f25454654ee5f5eb.tar.gz | |
Do not include system library paths in R_LD_LIBRARY_PATH, picking up system
libraries when previously preferring libraries from pkgsrc causes conflicts.
Fixes build on SmartOS where the platform /usr/lib/libgcc_s.so.1 for legacy
applications conflicts with GCC libraries from pkgsrc.
Diffstat (limited to 'math/R')
| -rw-r--r-- | math/R/distinfo | 4 | ||||
| -rw-r--r-- | math/R/patches/patch-ac | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/math/R/distinfo b/math/R/distinfo index 571fa147ef3..4b0d8c90849 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.54 2013/12/15 19:58:11 asau Exp $ +$NetBSD: distinfo,v 1.55 2014/01/09 13:52:41 jperkin Exp $ SHA1 (R-3.0.1.tar.gz) = 5cc65476837926fdf04105954ea94efa53ac85ce RMD160 (R-3.0.1.tar.gz) = 09910626891c2962b5c05d204b14d59444da0c3b Size (R-3.0.1.tar.gz) = 25508280 bytes -SHA1 (patch-ac) = 25e54a7fc8934d2997ea2eff8836784b45ad2a45 +SHA1 (patch-ac) = f80b8796ba08d0320315716fa1c13d01385fed12 SHA1 (patch-ad) = 21c2f74ceb41afa72b0b268ba4b1dcb57f01e106 SHA1 (patch-doc_manual_R-defs.texi) = 57ad7175cc1bba48bcc74d29c6f85c02a84e4891 SHA1 (patch-doc_manual_R-intro.texi) = 592dbbe5e048f5bcbbb94fa3aec32ff2f0e321ba diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index 2bdc9a630a8..4bf5d7e9308 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.30 2013/08/13 19:53:30 markd Exp $ +$NetBSD: patch-ac,v 1.31 2014/01/09 13:52:41 jperkin Exp $ + +Do not include system paths in R_LD_LIBRARY_PATH. --- configure.orig 2013-05-08 22:06:02.000000000 +0000 +++ configure @@ -20,6 +22,15 @@ $NetBSD: patch-ac,v 1.30 2013/08/13 19:53:30 markd Exp $ LTOALL=-flto fi +@@ -20375,7 +20375,7 @@ case "${host_os}" in + ## look-up sequence. Such automatic override has proven to break things + ## like system frameworks (e.g. ImageIO or OpenGL framework). + ;; +- *) ++ donotuse*) + for arg in ${LDFLAGS}; do + case "${arg}" in + -L*) @@ -23015,6 +23015,11 @@ fi done ;; |