Mon Dec 12 09:22:54 2016 UTC ()
glib2: don't build with libmount on linux, avoids spurious dependency
on libmount-dev (not provided in pkgsrc, linux only)

no response from maintainer yet.
this package being broken on bulk builds leads to 3472 dependents being
broken, so commit anyway.

from mutek in PR pkg/51681


(maya)
diff -r1.52 -r1.53 pkgsrc/devel/glib2/Makefile.common
cvs diff -r1.52 -r1.53 pkgsrc/devel/glib2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile.common 2016/11/25 12:42:21 1.52
+++ pkgsrc/devel/glib2/Makefile.common 2016/12/12 09:22:54 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.52 2016/11/25 12:42:21 prlw1 Exp $ 1# $NetBSD: Makefile.common,v 1.53 2016/12/12 09:22:54 maya 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.50.2 9DISTNAME= glib-2.50.2
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
@@ -27,26 +27,28 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/g @@ -27,26 +27,28 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/g
27PATCHDIR= ${.CURDIR}/../../devel/glib2/patches 27PATCHDIR= ${.CURDIR}/../../devel/glib2/patches
28 28
29GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
30CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 30CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
31CONFIGURE_ARGS+= --disable-fam # See sysutils/gio-fam. 31CONFIGURE_ARGS+= --disable-fam # See sysutils/gio-fam.
32CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib 32CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
33CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} 33CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
34CONFIGURE_ARGS+= --with-pcre=system 34CONFIGURE_ARGS+= --with-pcre=system
35CONFIGURE_ARGS+= --disable-dtrace 35CONFIGURE_ARGS+= --disable-dtrace
36CONFIGURE_ARGS+= --disable-man # Requires xsltproc and Docbook. 36CONFIGURE_ARGS+= --disable-man # Requires xsltproc and Docbook.
37CONFIGURE_ARGS+= --disable-modular-tests 37CONFIGURE_ARGS+= --disable-modular-tests
38# Avoid unnecessary autotools invocation. 38# Avoid unnecessary autotools invocation.
39CONFIGURE_ARGS+= --disable-maintainer-mode 39CONFIGURE_ARGS+= --disable-maintainer-mode
 40# Avoid linux dependency on libmount-dev
 41CONFIGURE_ARGS.Linux+= --disable-libmount
40 42
41# When ICONV_TYPE=gnu ensure we explicitly use the GNU version, to avoid 43# When ICONV_TYPE=gnu ensure we explicitly use the GNU version, to avoid
42# conflicts between iconv.h from converters/libiconv and builtin libiconv 44# conflicts between iconv.h from converters/libiconv and builtin libiconv
43# which may be non-GNU. 45# which may be non-GNU.
44CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu 46CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu
45 47
46CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} 48CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
47 49
48.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
49 51
50CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 52CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
51CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\"" 53CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
52CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 54CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""