From 74a451c1b78f7ff0ee050e53030940c9bd49d79b Mon Sep 17 00:00:00 2001
From: jmc <jmc@pkgsrc.org>
Date: Mon, 18 Aug 2003 03:37:47 +0000
Subject: Export proper link flags to LDFLAGS based on overall config (i.e.
 whether libiconv exists/is needed and whether to link it in). This means
 packages can avoid hardcoding LDFLAGS+=-liconv and breaking on -current.
 Fixes gnomeicu for -current and 1.6.x

---
 converters/libiconv/buildlink2.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'converters/libiconv')

diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index 845e4bf6d01..c40fa7a7a77 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:32:30 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/08/18 03:37:47 jmc Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
@@ -38,8 +38,6 @@ BUILDLINK_PACKAGES+=		iconv
 EVAL_PREFIX+=			BUILDLINK_PREFIX.iconv=libiconv
 BUILDLINK_PREFIX.iconv_DEFAULT=	${LOCALBASE}
 _BLNK_ICONV_LDFLAGS=		-L${BUILDLINK_PREFIX.iconv}/lib -liconv
-BUILDLINK_LIBICONV_LDADD=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
-BUILDLINK_LIBICONV_LDADD+=	${_BLNK_ICONV_LDFLAGS}
 .else
 BUILDLINK_PREFIX.iconv=		/usr
 .  if ${_BLNK_LIBICONV_FOUND} == "YES"
@@ -47,8 +45,10 @@ _BLNK_ICONV_LDFLAGS=		-liconv
 .  else
 _BLNK_ICONV_LDFLAGS=		# empty
 .  endif
-BUILDLINK_LIBICONV_LDADD=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
 .endif
+BUILDLINK_LIBICONV_LDADD=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+BUILDLINK_LIBICONV_LDADD+=	${_BLNK_ICONV_LDFLAGS}
+LDFLAGS+=			${BUILDLINK_LIBICONV_LDADD}
 
 LIBTOOL_ARCHIVE_UNTRANSFORM_SED+=	\
 	-e "s|${BUILDLINK_PREFIX.iconv}/lib/libiconv.la|${_BLNK_ICONV_LDFLAGS}|g" \
-- 
cgit v1.2.3