diff options
| author | drochner <drochner@pkgsrc.org> | 2003-07-01 16:44:55 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2003-07-01 16:44:55 +0000 |
| commit | 96b70d137c24df5c9ec8db26ebc8a803d3ebd5e3 (patch) | |
| tree | dfbecd10a41e00a802fad02b83923906fb688ec1 /devel/glib2 | |
| parent | 82bfa66092d35e1acf0f88ad783fb0dc8fc4ff28 (diff) | |
| download | pkgsrc-96b70d137c24df5c9ec8db26ebc8a803d3ebd5e3.tar.gz | |
NetBSD-current's iconv is good enough, remove USE_GNU_ICONV.
This saves all the headache about mixing GNU and native (lib)iconv.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib2/buildlink2.mk | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index b2af3bb52e7..39c0802c4c4 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/06/25 22:18:30 salo Exp $ +# $NetBSD: Makefile,v 1.25 2003/07/01 16:44:55 drochner Exp $ DISTNAME= glib-2.2.2 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -17,7 +17,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_GMAKE= yes USE_PERL5= yes -USE_GNU_ICONV= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -31,7 +30,6 @@ CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -CONFIGURE_ARGS+= --with-libiconv=gnu test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk index 909f40eb583..cf07b58742f 100644 --- a/devel/glib2/buildlink2.mk +++ b/devel/glib2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2003/06/30 18:30:55 drochner Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2003/07/01 16:44:55 drochner Exp $ .if !defined(GLIB2_BUILDLINK2_MK) GLIB2_BUILDLINK2_MK= # defined @@ -17,7 +17,6 @@ BUILDLINK_FILES.glib2+= lib/libgmodule-2.0.* BUILDLINK_FILES.glib2+= lib/libgobject-2.0.* BUILDLINK_FILES.glib2+= lib/libgthread-2.0.* -USE_GNU_ICONV= yes .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" |