diff options
| author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
| commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /converters | |
| parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
| download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.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 'converters')
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index ec71c73f7aa..eb881eabf80 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/03/07 05:58:31 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/03/14 19:37:32 jlam Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -38,7 +38,7 @@ BUILDLINK_PACKAGES+= iconv EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=libiconv BUILDLINK_PREFIX.iconv_DEFAULT= ${LOCALBASE} BUILDLINK_LIBICONV_LDADD= -L${BUILDLINK_PREFIX.iconv}/lib -BUILDLINK_LIBICONV_LDADD+= -Wl,-R${BUILDLINK_PREFIX.iconv}/lib +BUILDLINK_LIBICONV_LDADD+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib BUILDLINK_LIBICONV_LDADD+= -liconv .else BUILDLINK_PREFIX.iconv= /usr |