Mon Sep 8 08:44:54 2014 UTC ()
Add a comment explaining why we need to force --with-libiconv=gnu for
the ICONV_TYPE=gnu case.  Suggested by wiz.


(jperkin)
diff -r1.38 -r1.39 pkgsrc/devel/glib2/Makefile.common
cvs diff -r1.38 -r1.39 pkgsrc/devel/glib2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile.common 2014/09/08 08:33:59 1.38
+++ pkgsrc/devel/glib2/Makefile.common 2014/09/08 08:44:54 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.38 2014/09/08 08:33:59 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.39 2014/09/08 08:44:54 jperkin Exp $
2# 2#
3# used by devel/glib2/Makefile 3# used by devel/glib2/Makefile
4# used by devel/gdbus-codegen/Makefile 4# used by devel/gdbus-codegen/Makefile
5# used by sysutils/gio-fam/Makefile 5# used by sysutils/gio-fam/Makefile
6 6
7# When updating this package, please apply patch-ak to configure.in and 7# When updating this package, please apply patch-ak to configure.in and
8# then run a matching version of autoconf to regen patch-aa. 8# then run a matching version of autoconf to regen patch-aa.
9DISTNAME= glib-2.40.0 9DISTNAME= glib-2.40.0
10PKGNAME= ${DISTNAME:S/glib/glib2/} 10PKGNAME= ${DISTNAME:S/glib/glib2/}
11CATEGORIES= # empty; redefined in Makefile 11CATEGORIES= # empty; redefined in Makefile
12MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/} 12MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
@@ -30,26 +30,29 @@ PATCHDIR= ${.CURDIR}/../../devel/glib2/ @@ -30,26 +30,29 @@ PATCHDIR= ${.CURDIR}/../../devel/glib2/
30 30
31GNU_CONFIGURE= yes 31GNU_CONFIGURE= yes
32CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 32CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
33CONFIGURE_ARGS+= --disable-fam # See sysutils/gio-fam. 33CONFIGURE_ARGS+= --disable-fam # See sysutils/gio-fam.
34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib 34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
35CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} 35CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
36CONFIGURE_ARGS+= --with-pcre=system 36CONFIGURE_ARGS+= --with-pcre=system
37CONFIGURE_ARGS+= --disable-dtrace 37CONFIGURE_ARGS+= --disable-dtrace
38CONFIGURE_ARGS+= --disable-man # Requires xsltproc and Docbook. 38CONFIGURE_ARGS+= --disable-man # Requires xsltproc and Docbook.
39CONFIGURE_ARGS+= --disable-modular-tests 39CONFIGURE_ARGS+= --disable-modular-tests
40# Avoid unnecessary autotools invocation. 40# Avoid unnecessary autotools invocation.
41CONFIGURE_ARGS+= --disable-maintainer-mode 41CONFIGURE_ARGS+= --disable-maintainer-mode
42 42
 43# When ICONV_TYPE=gnu ensure we explicitly use the GNU version, to avoid
 44# conflicts between iconv.h from converters/libiconv and builtin libiconv
 45# which may be non-GNU.
43CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu 46CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu
44 47
45CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} 48CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
46 49
47.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
48 51
49 52
50CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 53CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
51CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\"" 54CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
52CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 55CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
53 56
54.if ${OPSYS} == "FreeBSD" 57.if ${OPSYS} == "FreeBSD"
55SUBST_CLASSES+= thr 58SUBST_CLASSES+= thr