22 lines
1.2 KiB
Plaintext
22 lines
1.2 KiB
Plaintext
$NetBSD: patch-ad,v 1.15 2012/12/17 09:08:47 wen Exp $
|
|
Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
|
|
--- src/main/Makefile.in.orig 2012-03-01 23:02:24.000000000 +0000
|
|
+++ src/main/Makefile.in
|
|
@@ -98,14 +98,14 @@ EXTRA_STATIC_LIBS = \
|
|
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL)
|
|
STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
|
|
|
|
-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
|
|
+EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS) @LIBMULTITHREAD@
|
|
|
|
R_binary = R.bin
|
|
R_bin_OBJECTS = Rmain.o @BUILD_LTO_TRUE@@WANT_R_SHLIB_FALSE@$(OBJECTS)
|
|
@BUILD_LTO_TRUE@@WANT_R_SHLIB_FALSE@R_bin_LDADD = $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(EXTRA_LIBS)
|
|
@BUILD_LTO_FALSE@@WANT_R_SHLIB_FALSE@R_bin_LDADD = libR.a $(EXTRA_LIBS)
|
|
## Linked against -lRblas becasue -lR is and otherwise ld complains.
|
|
-@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ -lR @BLAS_SHLIB_TRUE@-lRblas
|
|
+@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)
|