diff options
| author | drochner <drochner@pkgsrc.org> | 2010-11-17 14:36:45 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-11-17 14:36:45 +0000 |
| commit | 21d9ec5568ee2f7c0c55d7567ed5515e76ee3516 (patch) | |
| tree | 078b2ab7b60a47bfa597f0635ef3cb85f2c50d03 /devel/glib2/patches | |
| parent | b1269d0081b8ecca73f8c808b8655f7f802b6beb (diff) | |
| download | pkgsrc-21d9ec5568ee2f7c0c55d7567ed5515e76ee3516.tar.gz | |
don't call gio-querymodules on installation of gio-fam, the framework
will take care of this
Diffstat (limited to 'devel/glib2/patches')
| -rw-r--r-- | devel/glib2/patches/patch-cd | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd index d326b611db8..4f237aa4870 100644 --- a/devel/glib2/patches/patch-cd +++ b/devel/glib2/patches/patch-cd @@ -1,10 +1,10 @@ -$NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $ +$NetBSD: patch-cd,v 1.5 2010/11/17 14:36:45 drochner Exp $ sysutils/gio-fam builds the gio/fam backend as a separate module. Force it to link against the installed version of glib2, as it is not rebuilt by the package. ---- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 +--- gio/fam/Makefile.in.orig 2010-11-14 06:01:55.000000000 +0000 +++ gio/fam/Makefile.in @@ -76,10 +76,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(giomoduledir)" @@ -18,7 +18,7 @@ package. am__objects_1 = am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ libgiofam_la-fam-module.lo \ -@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ +@@ -384,9 +381,7 @@ libgiofam_la_CFLAGS = \ libgiofam_la_LDFLAGS = $(module_flags) libgiofam_la_LIBADD = \ @@ -29,12 +29,13 @@ package. $(GLIB_LIBS) \ $(FAM_LIBS) \ $(NULL) -@@ -777,7 +772,7 @@ check-local: test +@@ -817,9 +812,6 @@ lcov-clean: + check-local: test-nonrecursive install-data-hook: - if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ +- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ - $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ -+ ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ - fi +- fi uninstall-local: + $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache |