diff options
| author | seb <seb> | 2003-09-02 18:20:33 +0000 |
|---|---|---|
| committer | seb <seb> | 2003-09-02 18:20:33 +0000 |
| commit | caef558591ef7ac13304e447f46c55e415ba7636 (patch) | |
| tree | 71279c31e58e58f8deeec09ec8c102f5f8fa0fff | |
| parent | 60a25b2ad2c48a63f40787e6c11258bafb4209cc (diff) | |
| download | pkgsrc-caef558591ef7ac13304e447f46c55e415ba7636.tar.gz | |
NetBSD-current provide iconv(3) functionality in libc not
libiconv. Some packages insist on adding '-liconv' during link
or assumes the existent of it with they found iconv.h.
BUILDLINK_TRANSFORM can handle that.
Put it in in libiconv/buildlink2.mk for systematic coverage and
remove it from package "Makefile".
BTW this fix the build of chat/centericq - and probably others - on
-current.
Okayed by jlam@.
| -rw-r--r-- | chat/everybuddy/Makefile.common | 7 | ||||
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common index 4e6b5992548..9f8d52552cb 100644 --- a/chat/everybuddy/Makefile.common +++ b/chat/everybuddy/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2003/08/15 22:48:04 jmc Exp $ +# $NetBSD: Makefile.common,v 1.11 2003/09/02 18:20:34 seb Exp $ DISTNAME= everybuddy-0.2.0 CATEGORIES= chat @@ -31,8 +31,3 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/everybuddy .include "../../converters/libiconv/buildlink2.mk" - -_ICONV_LIB= ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//} -.if empty(_ICONV_LIB) -BUILDLINK_TRANSFORM+= S:-liconv: -.endif diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index c40fa7a7a77..3e652eae8e8 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.9 2003/08/18 03:37:47 jmc Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2003/09/02 18:20:33 seb Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -44,6 +44,7 @@ BUILDLINK_PREFIX.iconv= /usr _BLNK_ICONV_LDFLAGS= -liconv . else _BLNK_ICONV_LDFLAGS= # empty +BUILDLINK_TRANSFORM+= S:-liconv: . endif .endif BUILDLINK_LIBICONV_LDADD= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib |