diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2012-05-08 22:43:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:15:13 +0100 |
commit | b64eefe2bbdb3dc40b9acc275ca38e4743e5748c (patch) | |
tree | 53a4049fdfa14bce9adc8854ddadac4c196b4c3f /meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch | |
parent | 4abd299bf088c70d544668ac52997adab0a4dad8 (diff) | |
download | poky-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/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch')
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch | 40 |
1 files changed, 40 insertions, 0 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 0000000000..addda5f90c --- /dev/null +++ b/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Index: 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])],, | ||
17 | Index: 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" | ||