diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-10-05 16:54:30 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-10-06 11:48:39 +0200 |
| commit | 3fe434bf35b09ddf438392e6e5b4bc0b849495c7 (patch) | |
| tree | 800b6e303a2e073287bfa0e21bc2bd49a5607dc2 /package/glib-networking | |
| parent | d1e9016deacf776f2c13fd2741306927c0c1ebf0 (diff) | |
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>
Diffstat (limited to 'package/glib-networking')
| -rw-r--r-- | package/glib-networking/glib-networking.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 0ef69c46b..b12c9780e 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -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 |