summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-05-08 14:43:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:13 (GMT)
commitb64eefe2bbdb3dc40b9acc275ca38e4743e5748c (patch)
tree53a4049fdfa14bce9adc8854ddadac4c196b4c3f /meta
parent4abd299bf088c70d544668ac52997adab0a4dad8 (diff)
downloadpoky-b64eefe2bbdb3dc40b9acc275ca38e4743e5748c.tar.gz
pango: Fix modules load failure in multilib environment
Multi-libs of Pango need different modules, thus different config files and utils. This patch separate config file and utils with different MLPREFIX to avoid conflict. [YOCTO #2356] got fixed. (From OE-Core rev: 535e298b98182d95c3280d2d46aa6388e27aac40) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch40
-rw-r--r--meta/recipes-graphics/pango/pango.inc12
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb7
3 files changed, 54 insertions, 5 deletions
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch
new file mode 100644
index 0000000..addda5f
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch
@@ -0,0 +1,40 @@
1Index: pango-1.28.4/configure.in
2===================================================================
3--- pango-1.28.4.orig/configure.in 2011-04-05 04:29:16.000000000 +0800
4+++ pango-1.28.4/configure.in 2012-05-08 21:32:17.000000000 +0800
5@@ -205,6 +205,11 @@
6
7 AC_SUBST(PANGO_DEBUG_FLAGS)
8
9+AC_ARG_WITH(mlprefix,
10+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
11+ mlprefix_str=$withval, mlprefix_str="")
12+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
13+
14 AC_ARG_ENABLE(rebuilds,
15 [AC_HELP_STRING([--disable-rebuilds],
16 [disable all source autogeneration rules])],,
17Index: pango-1.28.4/pango/modules.c
18===================================================================
19--- pango-1.28.4.orig/pango/modules.c 2010-09-22 03:37:01.000000000 +0800
20+++ pango-1.28.4/pango/modules.c 2012-05-08 21:21:02.000000000 +0800
21@@ -529,7 +529,8 @@
22
23 if (!file_str)
24 file_str = g_build_filename (pango_get_sysconf_subdirectory (),
25- "pango.modules",
26+/* For multilib case, keep multiple config file for different libs */
27+ MLPREFIX "pango.modules",
28 NULL);
29
30 files = pango_split_file_list (file_str);
31@@ -640,7 +641,8 @@
32 if (!no_module_warning)
33 {
34 gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
35- "pango.modules",
36+/* For multilib case, keep multiple config file for different libs */
37+ MLPREFIX "pango.modules",
38 NULL);
39 g_critical ("No modules found:\n"
40 "No builtin or dynamically loaded modules were found.\n"
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index a2d5dc3..8ed92d3 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -34,7 +34,8 @@ FULL_OPTIMIZATION_arm = "-O2"
34 34
35EXTRA_OECONF = "--disable-glibtest \ 35EXTRA_OECONF = "--disable-glibtest \
36 --enable-explicit-deps=no \ 36 --enable-explicit-deps=no \
37 --disable-debug" 37 --disable-debug \
38 --with-mlprefix=${MLPREFIX}"
38 39
39LEAD_SONAME = "libpango-1.0*" 40LEAD_SONAME = "libpango-1.0*"
40LIBV = "1.6.0" 41LIBV = "1.6.0"
@@ -49,12 +50,19 @@ if ! [ -e $D${sysconfdir}/pango ] ; then
49fi 50fi
50} 51}
51 52
53do_install_append () {
54 if [ "${MLPREFIX}" != "" ]; then
55 mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules
56 fi
57}
58
59
52python populate_packages_prepend () { 60python populate_packages_prepend () {
53 prologue = d.getVar("postinst_prologue", True) 61 prologue = d.getVar("postinst_prologue", True)
54 62
55 modules_root = d.expand('${libdir}/pango/${LIBV}/modules') 63 modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
56 64
57 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') 65 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules')
58} 66}
59 67
60FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" 68FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 8d71de0..7055158 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,10 +2,11 @@ require pango.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r7" 5PR = "r8"
6 6
7SRC_URI += "file://no-tests.patch" 7SRC_URI += "file://no-tests.patch \
8SRC_URI += "file://noconst.patch" 8 file://noconst.patch \
9 file://multilib-fix-clean.patch"
9 10
10SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0" 11SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0"
11SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f" 12SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"