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 /devel/gettext-lib | |
| 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 'devel/gettext-lib')
| -rw-r--r-- | devel/gettext-lib/buildlink2.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk index 9bb04b11e73..44361abdc5e 100644 --- a/devel/gettext-lib/buildlink2.mk +++ b/devel/gettext-lib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.19 2003/03/07 05:59:48 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.20 2003/03/14 19:37:36 jlam Exp $ .if !defined(GETTEXT_BUILDLINK2_MK) GETTEXT_BUILDLINK2_MK= # defined @@ -88,7 +88,7 @@ _BLNK_LIBINTL= # empty .if ${_NEED_GNU_GETTEXT} == "YES" _BLNK_INCINTL+= -I${BUILDLINK_PREFIX.gettext}/include _BLNK_LIBINTL+= -L${BUILDLINK_PREFIX.gettext}/lib -_BLNK_LIBINTL+= -Wl,-R${BUILDLINK_PREFIX.gettext}/lib +_BLNK_LIBINTL+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.gettext}/lib _BLNK_LIBINTL+= -lintl . if ${_GETTEXT_NEEDS_ICONV} == "YES" _BLNK_LIBINTL+= ${BUILDLINK_LIBICONV_LDADD} @@ -98,6 +98,7 @@ _BLNK_LIBINTL+= ${BUILDLINK_LIBICONV_LDADD} _BLNK_LIBINTL+= -lintl . endif .endif +FIX_RPATH+= _BLNK_LIBINTL # The following section is written to avoid using a conditional based on # ${GNU_CONFIGURE}. |