Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
math/R/patches/patch-ad
+6 -5
View File
@@ -1,10 +1,11 @@
$NetBSD: patch-ad,v 1.18 2015/05/13 12:48:05 ryoon Exp $
$NetBSD: patch-ad,v 1.20 2016/07/26 04:53:33 wen Exp $
Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
--- src/main/Makefile.in.orig 2015-03-18 23:03:54.000000000 +0000
--- src/main/Makefile.in.orig 2016-07-26 01:55:40.000000000 +0000
+++ src/main/Makefile.in
@@ -103,13 +103,13 @@ EXTRA_STATIC_LIBS = \
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE)
@@ -94,13 +94,13 @@ MAIN_OBJS = `ls ../unix/*.o ../appl/*.o
EXTRA_STATIC_LIBS = $(R_TRE) $(R_XDR) $(R_LIBINTL) $(R_TZONE)
STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
@@ -18,4 +19,4 @@ Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
+@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR @BLAS_SHLIB_TRUE@-lRblas
@BUILD_LTO_FALSE@R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
libR_la = libR$(DYLIB_EXT)
libR_la = libR$(R_DYLIB_EXT)