From e767a2f74d82f758b768a87d7ed71a3e44a856a6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 11 Feb 2013 16:03:10 +0000 Subject: [PATCH] fontconfig: drop explicit -native recipe Instead, use BBCLASSEXTEND=native in fontconfig. We can drop the installation of fc-lang/fc-glyphname, they are not used by fontconfig's build anymore as it ships the generated files in the tarball. (From OE-Core rev: d5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../fontconfig/fontconfig-native_2.10.2.bb | 14 -------------- .../fontconfig/fontconfig_2.10.2.bb | 2 ++ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb deleted file mode 100644 index cee94de534..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -require fontconfig_${PV}.bb -inherit native -DEPENDS = "freetype-native expat-native zlib-native" - -EXTRA_OEMAKE = "" -EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % d.getVar('STAGING_BINDIR', True)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', True))]}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:" - -do_install_append () { - install -d ${D}${bindir}/ - install fc-lang/fc-lang ${D}${bindir}/ - install fc-glyphname/fc-glyphname ${D}${bindir}/ -} diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb index 6f2456d071..45631ed802 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb @@ -42,3 +42,5 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1" inherit autotools pkgconfig EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts" + +BBCLASSEXTEND = "native"