diff options
| author | jmmv <jmmv> | 2011-02-20 15:07:40 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2011-02-20 15:07:40 +0000 |
| commit | 768464754ff9ff6224547e0b3b8b8a55731174ee (patch) | |
| tree | 84531a539e687c03f0a70c5d65cb712ed385ca1a | |
| parent | d382e11bc19077fd20bff2932f5b7cfc36a01225 (diff) | |
| download | pkgsrc-768464754ff9ff6224547e0b3b8b8a55731174ee.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.
| -rw-r--r-- | devel/glib2/schemas.mk | 8 |
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" |