Patchwork [2/3] fontconfig: drop explicit -native recipe

login
register
mail settings
Submitter Ross Burton
Date Feb. 11, 2013, 4:03 p.m.
Message ID <123eb7971da069cbee5729fa368c6c9d8c0f1401.1360598515.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/44447/
State Accepted
Commit e767a2f74d82f758b768a87d7ed71a3e44a856a6
Headers show

Comments

Ross Burton - Feb. 11, 2013, 4:03 p.m.
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>
---
 .../fontconfig/fontconfig-native_2.10.2.bb               |   14 --------------
 meta/recipes-graphics/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

Patch

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 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 6f2456d..45631ed 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"