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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index cee94de..0000000
--- 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 6f2456d071ae37f7432e111a8cfdeaf668ddfbe5..45631ed8024f6e7771f158a77baf9b6fea40b713 100644 (file)
--- 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"