diff options
| author | joerg <joerg@pkgsrc.org> | 2019-12-18 12:42:04 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2019-12-18 12:42:04 +0000 |
| commit | eaefa1fb24a201c5b3d2b17bfc230b5860b65746 (patch) | |
| tree | 11bd1a0f23204bd4fd3ba51f29df430faf00cd8b | |
| parent | 0c2eb90deb041891c347f046633a070409e0d419 (diff) | |
| download | pkgsrc-eaefa1fb24a201c5b3d2b17bfc230b5860b65746.tar.gz | |
Fix rpath in DSO, don't test on runtime due to $DESTDIR.
| -rw-r--r-- | textproc/R-readr/Makefile | 7 | ||||
| -rw-r--r-- | textproc/R-readr/distinfo | 3 | ||||
| -rw-r--r-- | textproc/R-readr/patches/patch-src_Makevars | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/textproc/R-readr/Makefile b/textproc/R-readr/Makefile index cfdc22f8243..3f7145fc443 100644 --- a/textproc/R-readr/Makefile +++ b/textproc/R-readr/Makefile @@ -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 @@ -30,6 +31,10 @@ post-install: .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 --git a/textproc/R-readr/distinfo b/textproc/R-readr/distinfo index 9ed9d4d1751..acbc61bd5ad 100644 --- a/textproc/R-readr/distinfo +++ b/textproc/R-readr/distinfo @@ -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 --git a/textproc/R-readr/patches/patch-src_Makevars b/textproc/R-readr/patches/patch-src_Makevars new file mode 100644 index 00000000000..a199127d9e3 --- /dev/null +++ b/textproc/R-readr/patches/patch-src_Makevars @@ -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 |