From a771eb7968c94f0addf4db20c476555536382e51 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 14 Mar 2003 19:37:30 +0000 Subject: (1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG; Makefiles simply need to use this value often, for better or for worse. (2) Create a new variable FIX_RPATH that lists variables that should be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and additional variables may be appended from package Makefiles. --- math/R/buildlink2.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'math/R') diff --git a/math/R/buildlink2.mk b/math/R/buildlink2.mk index 3ec7fc38a42..fa8f4776982 100644 --- a/math/R/buildlink2.mk +++ b/math/R/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/12/10 11:58:10 markd Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/03/14 19:37:48 jlam Exp $ # # This Makefile fragment is included by packages that use the R shared library. # @@ -17,7 +17,8 @@ BUILDLINK_FILES.R+= lib/R/include/* BUILDLINK_FILES.R+= lib/R/include/R_ext/* BUILDLINK_CPPFLAGS.R= -I${BUILDLINK_PREFIX.R}/lib/R/include -BUILDLINK_LDFLAGS.R= -L${BUILDLINK_PREFIX.R}/lib/R/bin -Wl,-R${BUILDLINK_PREFIX.R}/lib/R/bin +BUILDLINK_LDFLAGS.R= -L${BUILDLINK_PREFIX.R}/lib/R/bin -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.R}/lib/R/bin +FIX_RPATH+= BUILDLINK_LDFLAGS.R BUILDLINK_TARGETS+= R-buildlink -- cgit v1.2.3