summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2011-02-20 15:07:40 +0000
committerjmmv <jmmv@pkgsrc.org>2011-02-20 15:07:40 +0000
commit34b7d874839001ebd07066a5698e9c3fbd5463d1 (patch)
tree84531a539e687c03f0a70c5d65cb712ed385ca1a /devel
parentc33c84461297cec62599cbc0c717ef79c160e68d (diff)
downloadpkgsrc-34b7d874839001ebd07066a5698e9c3fbd5463d1.tar.gz
TOOLS_NOOP is not enough to catch all calls to glib-compile-schemas because
some packages deduce the full name to the tool instead of relying on the PATH. Attempt to do better by setting the GLIB_COMPILE_SCHEMAS variable to a non-absolute name during the build, hoping that such packages do define this Makefile variable. This should fix the build of evince as reported in PR pkg/44589.
Diffstat (limited to 'devel')
-rw-r--r--devel/glib2/schemas.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/devel/glib2/schemas.mk b/devel/glib2/schemas.mk
index df121556817..14a916074a7 100644
--- a/devel/glib2/schemas.mk
+++ b/devel/glib2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.1 2011/01/18 10:03:59 jmmv Exp $
+# $NetBSD: schemas.mk,v 1.2 2011/02/20 15:07:40 jmmv Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GSettings schemas. It takes care of rebuilding the corresponding databases
@@ -17,6 +17,12 @@ INSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
DEINSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
TOOLS_NOOP+= glib-compile-schemas
+# Adding glib-compile-schemas to TOOLS_NOOP is not enough to mock out all
+# calls to this tool. Some packages do 'pkg-config --variable
+# glib_compile_schemas gio-2.0' to get the path to the binary. Do a best
+# effort here by overriding the possibly-defined GLIB_COMPILE_SCHEMAS
+# variable in the offending Makefiles.
+MAKE_FLAGS+= GLIB_COMPILE_SCHEMAS=glib-compile-schemas
.include "../../devel/glib2/buildlink3.mk"