diff options
| author | tron <tron> | 2004-01-15 23:04:00 +0000 |
|---|---|---|
| committer | tron <tron> | 2004-01-15 23:04:00 +0000 |
| commit | ed28ad73d624d68173962adc451ca63987d610b3 (patch) | |
| tree | 8faf229f38acc35d5846e12dfdb38b2266ac4b08 | |
| parent | d6e997523b4fc4b0ae951789b2f1091772388f5e (diff) | |
| download | pkgsrc-ed28ad73d624d68173962adc451ca63987d610b3.tar.gz | |
Don't use "-Wl" on platforms which define "_USE_RPATH" to "no". This
fixes build problems under Darwin.
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 4 | ||||
| -rw-r--r-- | devel/gettext-lib/buildlink2.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index 977883e97cb..d5019d58c59 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.11 2003/10/31 02:09:19 dmcmahill Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2004/01/15 23:04:00 tron Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -50,7 +50,9 @@ _BLNK_ICONV_LDFLAGS= # empty BUILDLINK_TRANSFORM+= S:-liconv: . endif .endif +.if ${_USE_RPATH} != no BUILDLINK_LIBICONV_LDADD= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib +.endif BUILDLINK_LIBICONV_LDADD+= ${_BLNK_ICONV_LDFLAGS} LDFLAGS+= ${BUILDLINK_LIBICONV_LDADD} diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk index 3fcb1c12796..c60b8cbe0e9 100644 --- a/devel/gettext-lib/buildlink2.mk +++ b/devel/gettext-lib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.24 2003/08/02 09:25:44 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.25 2004/01/15 23:04:00 tron Exp $ .if !defined(GETTEXT_BUILDLINK2_MK) GETTEXT_BUILDLINK2_MK= # defined @@ -88,7 +88,9 @@ _BLNK_LIBINTL= # empty .if ${_NEED_GNU_GETTEXT} == "YES" _BLNK_INCINTL+= -I${BUILDLINK_PREFIX.gettext}/include _BLNK_LIBINTL+= -L${BUILDLINK_PREFIX.gettext}/lib +.if ${_USE_RPATH} != no _BLNK_LIBINTL+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.gettext}/lib +.endif _BLNK_LIBINTL+= -lintl . if ${_GETTEXT_NEEDS_ICONV} == "YES" _BLNK_LIBINTL+= ${BUILDLINK_LIBICONV_LDADD} |