summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authormarkd <markd>2004-11-24 10:14:10 +0000
committermarkd <markd>2004-11-24 10:14:10 +0000
commit8cb124f2e889df3945cb84d730aff6375d340027 (patch)
tree4713f70ee57f57325ed790a3c2f21ce6ee078584 /math
parenta7f45982ea40b72e21457dd69cf043e2920a4554 (diff)
downloadpkgsrc-8cb124f2e889df3945cb84d730aff6375d340027.tar.gz
Make bulk build happy by fixing up the rpath. Not actually an issue in
normal operation as the binary is always called from a wrapper script that sets LD_LIBRARY_PATH.
Diffstat (limited to 'math')
-rw-r--r--math/R/distinfo3
-rw-r--r--math/R/patches/patch-ad13
2 files changed, 15 insertions, 1 deletions
diff --git a/math/R/distinfo b/math/R/distinfo
index 010360e97cc..448ee6e5da8 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/11/18 12:31:29 markd Exp $
+$NetBSD: distinfo,v 1.21 2004/11/24 10:14:10 markd Exp $
SHA1 (R-2.0.1.tar.gz) = 6440c0506b170edcea6bebba5faebc3ee682dcf2
Size (R-2.0.1.tar.gz) = 10645703 bytes
SHA1 (patch-aa) = fa1aba5fa71e8ec219ab6cd0f61ad0c22e6e4f10
SHA1 (patch-ac) = 84a7ab545e5f462d3c62745cc110ffcbc293ca49
+SHA1 (patch-ad) = b8cb795218f95113d512923a55e153e9cf9af7ee
SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad
new file mode 100644
index 00000000000..5ef649acef2
--- /dev/null
+++ b/math/R/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.8 2004/11/24 10:14:10 markd Exp $
+
+--- src/main/Makefile.in.orig 2004-11-16 01:31:44.000000000 +1300
++++ src/main/Makefile.in
+@@ -144,7 +144,7 @@ R: Makefile
+
+ $(R_binary): $(R_bin_OBJECTS) $(R_bin_DEPENDENCIES)
+ @WANT_R_SHLIB_FALSE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) $(R_bin_LDADD) $(LIBS)
+-@WANT_R_SHLIB_TRUE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) -L../../lib -lR
++@WANT_R_SHLIB_TRUE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) -L../../lib ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR
+
+ install-bin-local: $(R_binary)
+ @$(MAKE) rhome="$(abs_top_builddir)" install-bin