pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc NetBSD-current provide iconv(3) functionality in libc not



details:   https://anonhg.NetBSD.org/pkgsrc/rev/683ab81f5064
branches:  trunk
changeset: 460690:683ab81f5064
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Sep 02 18:20:33 2003 +0000

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

diffstat:

 chat/everybuddy/Makefile.common   |  7 +------
 converters/libiconv/buildlink2.mk |  3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 47c538c91a7e -r 683ab81f5064 chat/everybuddy/Makefile.common
--- a/chat/everybuddy/Makefile.common   Tue Sep 02 17:58:22 2003 +0000
+++ b/chat/everybuddy/Makefile.common   Tue Sep 02 18:20:33 2003 +0000
@@ -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 @@
        ${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 -r 47c538c91a7e -r 683ab81f5064 converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Tue Sep 02 17:58:22 2003 +0000
+++ b/converters/libiconv/buildlink2.mk Tue Sep 02 18:20:33 2003 +0000
@@ -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 @@
 _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



Home | Main Index | Thread Index | Old Index