diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-03-23 10:59:06 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:54:51 +0100 |
| commit | 832a499046e41be48fb035fa86df24589b94ada3 (patch) | |
| tree | 3354fe7f014d5ebadba43c59814d4a7341084ab8 /meta/recipes-core/glib-2.0 | |
| parent | ce4ff3dd80379e1bf71a967e0512591aaa046308 (diff) | |
| download | openembedded-core-contrib-832a499046e41be48fb035fa86df24589b94ada3.tar.gz | |
glib-2.0: Install gio-querymodules in main package
gio-querymodules should be used whenever new Gio modules are installed
(to regenerate the module cache) so it should be available by default.
Each multilib is going to need its own variant (because the tool
actually dlopens the modules when cache is generated), so it's
packaged as ${libexecdir}/${MLPREFIX}gio-querymodules
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
3 files changed, 43 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch new file mode 100644 index 0000000000..561d100209 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -0,0 +1,31 @@ +From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 22 Mar 2016 15:14:58 +0200 +Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM + +We want to install this binary with the gio library, and debian +renamer does not cope with library packages with files in ${bindir} + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [OE specific] +--- + gio/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index b7f91cc..4d81cc0 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -702,7 +702,8 @@ gio.def: libgio-2.0.la + gio-2.0.lib: libgio-2.0.la gio.def + $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ + +-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings ++bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings ++libexec_PROGRAMS = gio-querymodules + + glib_compile_resources_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ +-- +2.1.4 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb index 2a2efae977..8e445b4154 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://Enable-more-tests-while-cross-compiling.patch \ file://gi-exclude.patch \ + file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 35153fa2a7..75a7d250d8 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -48,8 +48,12 @@ do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in } -FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \ - ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" +FILES_${PN} = "${libdir}/lib*${SOLIBS} \ + ${libdir}/gio \ + ${libexecdir}/*gio-querymodules \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/glib-2.0/gettext/mkinstalldirs \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la" @@ -81,6 +85,11 @@ do_install_append () { rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test fi fi + + # Make sure gio-querymodules is unique among multilibs + if test "x${MLPREFIX}" != "x"; then + mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules + fi } do_install_append_libc-musl () { |