pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/R Make bulk build happy by fixing up the rpath. ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/18fb120f2cb0
branches:  trunk
changeset: 484077:18fb120f2cb0
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Nov 24 10:14:10 2004 +0000

description:
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:

 math/R/distinfo         |   3 ++-
 math/R/patches/patch-ad |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 5168b0575a0c -r 18fb120f2cb0 math/R/distinfo
--- a/math/R/distinfo   Wed Nov 24 09:34:11 2004 +0000
+++ b/math/R/distinfo   Wed Nov 24 10:14:10 2004 +0000
@@ -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 -r 5168b0575a0c -r 18fb120f2cb0 math/R/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/R/patches/patch-ad   Wed Nov 24 10:14:10 2004 +0000
@@ -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



Home | Main Index | Thread Index | Old Index