diff options
author | Richard Purdie <richard@ted.(none)> | 2009-01-02 15:34:40 +0000 |
---|---|---|
committer | Richard Purdie <richard@ted.(none)> | 2009-01-02 15:34:40 +0000 |
commit | f8a23031e2a02e5fbef63a01d33e036bc57240b3 (patch) | |
tree | 97ba7224a9a46fcd5ecec81ab3258c06bc6f9498 /meta/packages/fontconfig | |
parent | 61d8ea7a140e2e5bf77839c8ee914ae903c83de8 (diff) | |
download | poky-f8a23031e2a02e5fbef63a01d33e036bc57240b3.tar.gz |
Drop now unneeded FILESDIR and S variables from various recipes
Diffstat (limited to 'meta/packages/fontconfig')
-rw-r--r-- | meta/packages/fontconfig/fontconfig-native_2.6.0.bb | 3 | ||||
-rw-r--r-- | meta/packages/fontconfig/fontconfig_2.6.0.bb | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb index 541b74634c..0b95cf6682 100644 --- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb +++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb | |||
@@ -1,9 +1,6 @@ | |||
1 | SECTION = "base" | ||
2 | LICENSE = "BSD" | ||
3 | require fontconfig_${PV}.bb | 1 | require fontconfig_${PV}.bb |
4 | inherit native | 2 | inherit native |
5 | DEPENDS = "freetype-native expat-native zlib-native" | 3 | DEPENDS = "freetype-native expat-native zlib-native" |
6 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" | ||
7 | 4 | ||
8 | EXTRA_OEMAKE = "" | 5 | EXTRA_OEMAKE = "" |
9 | EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" | 6 | EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" |
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb index 4a4c31fbea..4c0d5e16b5 100644 --- a/meta/packages/fontconfig/fontconfig_2.6.0.bb +++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb | |||
@@ -19,8 +19,6 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils" | |||
19 | RCONFLICTS_fontconfig-utils = "libfontconfig-utils" | 19 | RCONFLICTS_fontconfig-utils = "libfontconfig-utils" |
20 | DEBIAN_NOAUTONAME_fontconfig-utils = "1" | 20 | DEBIAN_NOAUTONAME_fontconfig-utils = "1" |
21 | 21 | ||
22 | S = "${WORKDIR}/fontconfig-${PV}" | ||
23 | |||
24 | PARALLEL_MAKE = "" | 22 | PARALLEL_MAKE = "" |
25 | 23 | ||
26 | inherit autotools pkgconfig | 24 | inherit autotools pkgconfig |