Skip to contentSkip to conversation

glib-networking: specify GIO_MODULE_DIR for target

PATCH New Gustavo Zacarias 2 participants 3 messages Oct 5, 2015 – Oct 6, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/glib-networking/glib-networking.mk | 2 ++
 1 file changed, 2 insertions(+)
package/glib-networking/glib-networking.mk +2 -0
index deb138a..67a9203 100644
@@ -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
Signature · 1 line
2.4.9
#1 lore raw

PATCH 1/1 glib-networking: specify GIO_MODULE_DIR for target

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

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.

Quoted 4 lines

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

Committed, thanks.

Lets hope we won't have too much other fallout from the bump.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 glib-networking: specify GIO_MODULE_DIR for target

Quoted 3 lines · Peter Korsgaard

Committed, thanks.

Lets hope we won't have too much other fallout from the bump.

Hi.
The other glib/gio module-installing package (gvfs) computes the gio install directory based on it's own destdir, so at least that one is safe from the abuse.
Regards.