diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-05 22:54:59 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:01:49 +0000 |
| commit | 9a86d2a876f5cce9c2825f8fd5bf5dc9aaf9d7a1 (patch) | |
| tree | 2829aac165f49050de28e02b035500714559ad9d /meta/recipes-graphics/pango/pango.inc | |
| parent | d19d221ca77ff5cfbe92cf8234b2f4f35dd07329 (diff) | |
| download | openembedded-core-contrib-9a86d2a876f5cce9c2825f8fd5bf5dc9aaf9d7a1.tar.gz | |
pango: Upgrade 1.36.8 -> 1.38.1
Pango is now a simple a simple library and no longer has
- modules
- engines
- configuration
Dropping all related things from the recipe.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/pango/pango.inc')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index df0fdf679a..c0109b2bc7 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -21,51 +21,20 @@ PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib- BBCLASSEXTEND = "native" DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" -PACKAGES_DYNAMIC += "^pango-module-.*" - -RRECOMMENDS_${PN} = "pango-module-basic-fc" - inherit gnomebase gtk-doc qemu ptest -# Create a pango-modules package -ALLOW_EMPTY_${BPN}-modules = "1" -PACKAGES += "${BPN}-modules" -RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" - - EXTRA_AUTORECONF = "" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" EXTRA_OECONF = "--disable-introspection \ - --enable-explicit-deps=no \ --disable-debug \ - --with-mlprefix=${MLPREFIX}" + " LEAD_SONAME = "libpango-1.0*" LIBV = "1.8.0" -pango_postinst() { -if ! [ -e $D${sysconfdir}/pango ] ; then - mkdir -p $D${sysconfdir}/pango -fi - -if [ -n "$D" ]; then - ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ - $D${libdir}/pango/${LIBV}/modules/*.so \ - > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null - - [ $? -ne 0 ] && exit 1 - - sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules - - exit 0 -else - ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules -fi -} - # This binary needs to be compiled for the host architecture. This isn't pretty! do_compile_prepend () { if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then @@ -73,22 +42,7 @@ do_compile_prepend () { fi } -do_install_append () { - if [ "${MLPREFIX}" != "" ]; then - mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules - fi -} - - -python populate_packages_prepend () { - pango_postinst = d.getVar("pango_postinst", True) - - modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) -} - -FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" |