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 (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,99 +1,102 @@ @@ -1,99 +1,102 @@
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
15MAINTAINER= prlw1@cam.ac.uk 15MAINTAINER= prlw1@cam.ac.uk
16HOMEPAGE= http://developer.gnome.org/glib/ 16HOMEPAGE= http://developer.gnome.org/glib/
17COMMENT= # empty; redefined in Makefile 17COMMENT= # empty; redefined in Makefile
18LICENSE= gnu-lgpl-v2 18LICENSE= gnu-lgpl-v2
19 19
20PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
21 21
22USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
23USE_TOOLS+= gmake pkg-config 23USE_TOOLS+= gmake pkg-config
24USE_LANGUAGES= c c++ c99 24USE_LANGUAGES= c c++ c99
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26TEST_TARGET= check 26TEST_TARGET= check
27 27
28DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo 28DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
29PATCHDIR= ${.CURDIR}/../../devel/glib2/patches 29PATCHDIR= ${.CURDIR}/../../devel/glib2/patches
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
56SUBST_STAGE.thr= post-patch 59SUBST_STAGE.thr= post-patch
57SUBST_FILES.thr= gthread/Makefile.in 60SUBST_FILES.thr= gthread/Makefile.in
58. if ${OS_VERSION:R} >= 5 61. if ${OS_VERSION:R} >= 5
59SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g" 62SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
60. else 63. else
61SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g" 64SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
62. endif 65. endif
63SUBST_MESSAGE.thr= Fixing libgthread. 66SUBST_MESSAGE.thr= Fixing libgthread.
64 67
65.endif 68.endif
66 69
67.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*) 70.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
68CONFIGURE_ENV+= gt_cv_c_wchar_t=no 71CONFIGURE_ENV+= gt_cv_c_wchar_t=no
69.endif 72.endif
70 73
71.if ${OPSYS} == "Darwin" 74.if ${OPSYS} == "Darwin"
72BUILDLINK_TRANSFORM+= rm:-Werror=missing-prototypes 75BUILDLINK_TRANSFORM+= rm:-Werror=missing-prototypes
73.endif 76.endif
74 77
75.if ${OPSYS} == "HPUX" 78.if ${OPSYS} == "HPUX"
76CONFIGURE_ENV+= ac_cv_func_mmap_fixed_mapped=yes 79CONFIGURE_ENV+= ac_cv_func_mmap_fixed_mapped=yes
77.endif 80.endif
78 81
79.if ${OPSYS} == "SunOS" 82.if ${OPSYS} == "SunOS"
80BUILDLINK_TRANSFORM+= rm:-Werror=format=2 83BUILDLINK_TRANSFORM+= rm:-Werror=format=2
81.endif 84.endif
82 85
83.include "../../mk/dlopen.buildlink3.mk" 86.include "../../mk/dlopen.buildlink3.mk"
84 87
85.if !empty(MACHINE_PLATFORM:MIRIX-5*) 88.if !empty(MACHINE_PLATFORM:MIRIX-5*)
86CONFIGURE_ARGS+= --disable-threads 89CONFIGURE_ARGS+= --disable-threads
87.else 90.else
88.include "../../mk/pthread.buildlink3.mk" 91.include "../../mk/pthread.buildlink3.mk"
89.endif 92.endif
90 93
91BUILD_DEFS+= VARBASE 94BUILD_DEFS+= VARBASE
92SUBST_CLASSES+= dbusdb 95SUBST_CLASSES+= dbusdb
93SUBST_MESSAGE.dbusdb= Adjust dbus machine uuid path to dbus package 96SUBST_MESSAGE.dbusdb= Adjust dbus machine uuid path to dbus package
94SUBST_STAGE.dbusdb= post-patch 97SUBST_STAGE.dbusdb= post-patch
95SUBST_FILES.dbusdb= gio/gdbusconnection.c 98SUBST_FILES.dbusdb= gio/gdbusconnection.c
96SUBST_FILES.dbusdb+= gio/gdbusprivate.c 99SUBST_FILES.dbusdb+= gio/gdbusprivate.c
97SUBST_FILES.dbusdb+= po/glib20.pot 100SUBST_FILES.dbusdb+= po/glib20.pot
98SUBST_FILES.dbusdb+= po/*.po 101SUBST_FILES.dbusdb+= po/*.po
99SUBST_SED.dbusdb= -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g' 102SUBST_SED.dbusdb= -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'