Commit 3fe434bf authored Oct 05, 2015 by Gustavo Zacarias Committed by Peter Korsgaard Oct 06, 2015

glib-networking: specify GIO_MODULE_DIR for target



Since the upgrade to pkgconf 0.9.12 all directories and variables with
directories are sysroot-prefixed, whereas with the old patch only some
variables were (includedir, mapdir, sdkdir, libdir).

libglib2 uses a giomoduledir=${libdir}/gio/modules variable in
gio-2.0.pc, which when expanded via sysroot by pkgconf at configure time
points to the staging directory (via libdir expansion).
When target install gets called the gio module gets installed to staging
rather than target, with the obvious consequences this has.

Work-around this pkgconfig abuse by overriding GIO_MODULE_DIR at target
install time.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent d1e9016d

package/glib-networking/glib-networking.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ GLIB_NETWORKING_DEPENDENCIES = \
		libglib2
		GLIB_NETWORKING_LICENSE = LGPLv2+
		GLIB_NETWORKING_LICENSE_FILES = COPYING
		GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
		GIO_MODULE_DIR=/usr/lib/gio/modules install

		ifeq ($(BR2_PACKAGE_GNUTLS),y)
		GLIB_NETWORKING_DEPENDENCIES += gnutls