pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/textproc/R-readr Fix rpath in DSO, don't test on runti...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/17289891a823
branches:  trunk
changeset: 345803:17289891a823
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 18 12:42:04 2019 +0000

description:
Fix rpath in DSO, don't test on runtime due to $DESTDIR.

diffstat:

 textproc/R-readr/Makefile                   |   7 ++++++-
 textproc/R-readr/distinfo                   |   3 ++-
 textproc/R-readr/patches/patch-src_Makevars |  13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r 0669fc02285c -r 17289891a823 textproc/R-readr/Makefile
--- a/textproc/R-readr/Makefile Wed Dec 18 12:40:22 2019 +0000
+++ b/textproc/R-readr/Makefile Wed Dec 18 12:42:04 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2019/09/25 17:35:51 brook Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/18 12:42:04 joerg Exp $
 
 R_PKGNAME=     readr
 R_PKGVER=      1.3.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -30,6 +31,10 @@
 .endif
 
 .include "../../math/R/Makefile.extension"
+
+# Can't find librcon.so during test.
+R_PKG_INSTALL_ARGS+=   --no-test-load
+
 .include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0669fc02285c -r 17289891a823 textproc/R-readr/distinfo
--- a/textproc/R-readr/distinfo Wed Dec 18 12:40:22 2019 +0000
+++ b/textproc/R-readr/distinfo Wed Dec 18 12:42:04 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/07/31 13:52:15 brook Exp $
+$NetBSD: distinfo,v 1.2 2019/12/18 12:42:04 joerg Exp $
 
 SHA1 (R/readr_1.3.1.tar.gz) = 82b92ca252d6079778c32ed634fe1e3fc4cb109e
 RMD160 (R/readr_1.3.1.tar.gz) = d513393cf41e234fa907d55e2902252bdbb30353
 SHA512 (R/readr_1.3.1.tar.gz) = 343079275436fedf6a6c539692cdf23a7b877c2f62c439ab030fb72aa145bd39bf8d2574aaf095e1c6baadba1be3ae44789e209386bd27cfe1c8d1512d14b9fd
 Size (R/readr_1.3.1.tar.gz) = 268853 bytes
+SHA1 (patch-src_Makevars) = 8f0f388c32b19e82bf4899a3c3bd4da42b8860dd
diff -r 0669fc02285c -r 17289891a823 textproc/R-readr/patches/patch-src_Makevars
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/R-readr/patches/patch-src_Makevars       Wed Dec 18 12:42:04 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makevars,v 1.1 2019/12/18 12:42:04 joerg Exp $
+
+--- src/Makevars.orig  2019-12-10 22:19:51.276819189 +0000
++++ src/Makevars
+@@ -6,7 +6,7 @@ else
+ RPATH = '../../rcon$(R_ARCH)'
+ endif
+ 
+-PKG_LIBS = -L. -lrcon -L$(RCON_DIR) -Wl,-rpath,'$$ORIGIN/$(RPATH)'
++PKG_LIBS = -L. -lrcon -L$(RCON_DIR) -Wl,-rpath,${PREFIX}/lib/R/library/readr/rcon
+ PKG_CXXFLAGS = -I. -Ircon
+ 
+ LIBRCON = ../inst/rcon$(R_ARCH)/librcon.so



Home | Main Index | Thread Index | Old Index