diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /math | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz | |
(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.
Diffstat (limited to 'math')
| -rw-r--r-- | math/R/buildlink2.mk | 5 | ||||
| -rw-r--r-- | math/octave/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
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 diff --git a/math/octave/Makefile b/math/octave/Makefile index 8e01446e0af..b40cac9c07b 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/03/13 17:37:24 fredb Exp $ +# $NetBSD: Makefile,v 1.31 2003/03/14 19:37:48 jlam Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -26,7 +26,7 @@ USE_LIBTOOL= yes USE_GMAKE= yes CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}" CPPFLAGS+= -I${WRKDIR}/include -LDFLAGS+= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib +LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib INFO_FILES= liboctave.info octave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3 |