pango: enable ptest
Install the test suite for ptest. The test suite needs some fonts to be present to depend on liberation-fonts. (From OE-Core rev: af387e788ed73130331536c7b22c6237e7c23c71) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a62e952b81
commit
31c338c767
|
@ -12,8 +12,11 @@ LICENSE = "LGPLv2.0+"
|
|||
X11DEPENDS = "virtual/libx11 libxft"
|
||||
DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}"
|
||||
|
||||
PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
|
||||
PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
|
||||
|
@ -22,7 +25,8 @@ PACKAGES_DYNAMIC += "^pango-module-.*"
|
|||
|
||||
RRECOMMENDS_${PN} = "pango-module-basic-fc"
|
||||
|
||||
inherit gnomebase gtk-doc qemu
|
||||
inherit gnomebase gtk-doc qemu ptest
|
||||
|
||||
# Create a pango-modules package
|
||||
ALLOW_EMPTY_${BPN}-modules = "1"
|
||||
PACKAGES += "${BPN}-modules"
|
||||
|
@ -60,6 +64,13 @@ if [ "x$D" != "x" ]; then
|
|||
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
|
||||
make CC="${BUILD_CC}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode
|
||||
fi
|
||||
}
|
||||
|
||||
do_install_append () {
|
||||
if [ "${MLPREFIX}" != "" ]; then
|
||||
mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules
|
||||
|
@ -78,3 +89,9 @@ python populate_packages_prepend () {
|
|||
FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
|
||||
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
|
||||
|
||||
FILES_${PN}-ptest += "${libexecdir}/pango/installed-tests/* \
|
||||
${datadir}/installed-tests/pango"
|
||||
FILES_${PN}-dbg += "${libexecdir}/pango/installed-tests/.debug"
|
||||
|
||||
RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts"
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: pango-1.30.0/Makefile.am
|
||||
===================================================================
|
||||
--- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300
|
||||
+++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
## Process this file with automake to create Makefile.in.
|
||||
|
||||
-SUBDIRS= pango modules pango-view examples docs tools tests build
|
||||
+SUBDIRS= pango modules pango-view examples docs tools build
|
||||
|
||||
EXTRA_DIST = \
|
||||
autogen.sh \
|
|
@ -0,0 +1,3 @@
|
|||
#! /bin/sh
|
||||
|
||||
gnome-desktop-testing-runner pango
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
|
|||
|
||||
GNOME_COMPRESS_TYPE="xz"
|
||||
|
||||
SRC_URI += "file://no-tests.patch \
|
||||
SRC_URI += "file://run-ptest \
|
||||
file://multilib-fix-clean.patch \
|
||||
"
|
||||
|
||||
|
|
Loading…
Reference in New Issue