summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/fontconfig
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-11 16:03:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 22:47:24 +0000
commitd5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78 (patch)
tree34baa8cb068c6b86a73cb50089862ae3647289d5 /meta/recipes-graphics/fontconfig
parentba3db5f5e7055d597b21d8b5f8e60bc3c4f12bd2 (diff)
downloadopenembedded-core-d5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78.tar.gz
openembedded-core-d5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78.tar.bz2
openembedded-core-d5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78.zip
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>
Diffstat (limited to 'meta/recipes-graphics/fontconfig')
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb14
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb2
2 files changed, 2 insertions, 14 deletions
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"