summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2012-01-12 15:39:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-16 12:24:56 +0000
commit094118031c7e9d47d34d433ce4f9a6b054c9145f (patch)
treeaf5867b241e8d4f4505b16234da0d5dde796f694 /meta
parente2948feae83f75bda5ef88dcc375dc6481506a37 (diff)
downloadpoky-094118031c7e9d47d34d433ce4f9a6b054c9145f.tar.gz
pango.inc: add directory "/etc/pango"
Command "pango-querymodules > /etc/pango/pango.modules" can't work when \ starting up yocto because of no directory "/etc/pango". It will cause \ messy code when gtk-demo running. [YOCTO #1900] [RP: PR bump] (From OE-Core rev: 65186bd86170d8c375931a18487c2fdf3bd1b3b0) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/pango/pango.inc6
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index b428b9df06..5a2555f11f 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -46,6 +46,11 @@ fi
46 46
47} 47}
48 48
49# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
50do_install_prepend() {
51 install -d ${D}/${sysconfdir}/pango
52}
53
49python populate_packages_prepend () { 54python populate_packages_prepend () {
50 prologue = d.getVar("postinst_prologue", 1) 55 prologue = d.getVar("postinst_prologue", 1)
51 56
@@ -54,6 +59,5 @@ python populate_packages_prepend () {
54 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') 59 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
55} 60}
56 61
57FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
58FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" 62FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
59FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" 63FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index d7af871ce3..d2776a6700 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,7 +2,7 @@ require pango.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r3" 5PR = "r4"
6 6
7SRC_URI += "file://no-tests.patch" 7SRC_URI += "file://no-tests.patch"
8SRC_URI += "file://noconst.patch" 8SRC_URI += "file://noconst.patch"