summaryrefslogtreecommitdiff
path: root/devel/glib2/patches/patch-cm
blob: f81394603061963ff7ef20614520b5d3e38fd259 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
$NetBSD: patch-cm,v 1.3 2013/12/08 13:08:59 prlw1 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.
(patch-cd)
--- gio/fam/Makefile.am.orig	2012-03-11 23:55:40.000000000 +0000
+++ gio/fam/Makefile.am
@@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
 	-DGIO_COMPILATION		\
 	-DG_DISABLE_DEPRECATED
 
-libgiofam_la_LDFLAGS = $(module_flags)
+libgiofam_la_LDFLAGS = $(module_flags) \
+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0)
 libgiofam_la_LIBADD = \
-		$(top_builddir)/gio/libgio-2.0.la \
-		$(top_builddir)/gobject/libgobject-2.0.la \
-		$(top_builddir)/glib/libglib-2.0.la \
 		$(GLIB_LIBS) \
 		$(FAM_LIBS) \
 		$(NULL)
@@ -41,9 +39,6 @@ RUN_QUERY_MODULES=true
 endif
 
 install-data-hook:
-	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
-	fi
 
 uninstall-local:
 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache