[pkgsrc/trunk]: pkgsrc/converters/libiconv Export proper link flags to LDFLAG...

[jmc <jmc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10f866ea8e36
branches:  trunk
changeset: 460068:10f866ea8e36
user:      jmc <jmc%pkgsrc.org@localhost>
date:      Mon Aug 18 03:37:47 2003 +0000

description:
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

diffstat:

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

diffs (30 lines):

diff -r 97f3cf3d511d -r 10f866ea8e36 converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Mon Aug 18 01:03:37 2003 +0000
+++ b/converters/libiconv/buildlink2.mk Mon Aug 18 03:37:47 2003 +0000
@@ -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 @@
 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 @@
 .  else
 _BLNK_ICONV_LDFLAGS=           # empty
 .  endif
+.endif
 BUILDLINK_LIBICONV_LDADD=      -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
-.endif
+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" \