summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-03-23 10:59:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-28 15:55:49 +0100
commit0cda9d8c8ddf67bad1a043c3486e1febcab646cf (patch)
treedebabc5887b40698353d8bfba74d03f478f3cbdb /meta/recipes-core
parent9ac1b6fc399b28093b213959a568210e4037886f (diff)
downloadpoky-0cda9d8c8ddf67bad1a043c3486e1febcab646cf.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 (From OE-Core rev: 832a499046e41be48fb035fa86df24589b94ada3) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch31
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb1
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc13
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 @@
1From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
5
6We want to install this binary with the gio library, and debian
7renamer does not cope with library packages with files in ${bindir}
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Inappropriate [OE specific]
11---
12 gio/Makefile.am | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/gio/Makefile.am b/gio/Makefile.am
16index b7f91cc..4d81cc0 100644
17--- a/gio/Makefile.am
18+++ b/gio/Makefile.am
19@@ -702,7 +702,8 @@ gio.def: libgio-2.0.la
20 gio-2.0.lib: libgio-2.0.la gio.def
21 $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
22
23-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
24+bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings
25+libexec_PROGRAMS = gio-querymodules
26
27 glib_compile_resources_LDADD = libgio-2.0.la \
28 $(top_builddir)/gobject/libgobject-2.0.la \
29--
302.1.4
31
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 \
16 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 16 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
17 file://Enable-more-tests-while-cross-compiling.patch \ 17 file://Enable-more-tests-while-cross-compiling.patch \
18 file://gi-exclude.patch \ 18 file://gi-exclude.patch \
19 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
19 " 20 "
20 21
21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ 22SRC_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() {
48 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in 48 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
49} 49}
50 50
51FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \ 51FILES_${PN} = "${libdir}/lib*${SOLIBS} \
52 ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" 52 ${libdir}/gio \
53 ${libexecdir}/*gio-querymodules \
54 ${datadir}/glib-2.0/schemas \
55 ${datadir}/glib-2.0/gettext/mkinstalldirs \
56 ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
53FILES_${PN}-dev += "${libdir}/glib-2.0/include \ 57FILES_${PN}-dev += "${libdir}/glib-2.0/include \
54 ${libdir}/gio/modules/lib*${SOLIBSDEV} \ 58 ${libdir}/gio/modules/lib*${SOLIBSDEV} \
55 ${libdir}/gio/modules/*.la" 59 ${libdir}/gio/modules/*.la"
@@ -81,6 +85,11 @@ do_install_append () {
81 rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test 85 rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
82 fi 86 fi
83 fi 87 fi
88
89 # Make sure gio-querymodules is unique among multilibs
90 if test "x${MLPREFIX}" != "x"; then
91 mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
92 fi
84} 93}
85 94
86do_install_append_libc-musl () { 95do_install_append_libc-musl () {