diff options
author | Ross Burton <ross.burton@intel.com> | 2013-02-11 16:03:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 22:48:50 +0000 |
commit | e767a2f74d82f758b768a87d7ed71a3e44a856a6 (patch) | |
tree | 5a59ffdd803cbd672d27b2695f9571f0e678dec4 /meta/recipes-graphics/fontconfig | |
parent | 556217d48249bf63f82ab1529ab115a3b7aa6da0 (diff) | |
download | poky-e767a2f74d82f758b768a87d7ed71a3e44a856a6.tar.gz |
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 <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.bb | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb | 2 |
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 @@ | |||
1 | require fontconfig_${PV}.bb | ||
2 | inherit native | ||
3 | DEPENDS = "freetype-native expat-native zlib-native" | ||
4 | |||
5 | EXTRA_OEMAKE = "" | ||
6 | 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))]}" | ||
7 | |||
8 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:" | ||
9 | |||
10 | do_install_append () { | ||
11 | install -d ${D}${bindir}/ | ||
12 | install fc-lang/fc-lang ${D}${bindir}/ | ||
13 | install fc-glyphname/fc-glyphname ${D}${bindir}/ | ||
14 | } | ||
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" | |||
42 | inherit autotools pkgconfig | 42 | inherit autotools pkgconfig |
43 | 43 | ||
44 | EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts" | 44 | EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts" |
45 | |||
46 | BBCLASSEXTEND = "native" | ||