summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2014-09-08 08:33:59 +0000
committerjperkin <jperkin@pkgsrc.org>2014-09-08 08:33:59 +0000
commitf1e97f6badb3418dc2b3e81710726f5d3fb2db3e (patch)
treed91db111c28bd2f2e4b9f23046aba81b0269d9f6 /devel
parent0186f7a324145ee9e873414402723bfafaa6ed05 (diff)
downloadpkgsrc-f1e97f6badb3418dc2b3e81710726f5d3fb2db3e.tar.gz
Put back CONFIGURE_ARGS.gnu-iconv, it is required for the ICONV_TYPE=gnu
case to avoid conflicts between the native libiconv and iconv.h from GNU libiconv and ensure only GNU libiconv is used. Discussed with prlw1.
Diffstat (limited to 'devel')
-rw-r--r--devel/glib2/Makefile.common4
1 files changed, 3 insertions, 1 deletions
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 7ce9b5ffea6..bde0c5d651b 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2014/09/05 20:49:55 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.38 2014/09/08 08:33:59 jperkin Exp $
#
# used by devel/glib2/Makefile
# used by devel/gdbus-codegen/Makefile
@@ -40,6 +40,8 @@ CONFIGURE_ARGS+= --disable-modular-tests
# Avoid unnecessary autotools invocation.
CONFIGURE_ARGS+= --disable-maintainer-mode
+CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu
+
CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
.include "../../mk/bsd.prefs.mk"