summaryrefslogtreecommitdiffstats
path: root/meta/packages/fontconfig
diff options
context:
space:
mode:
authorRichard Purdie <richard@ted.(none)>2009-01-02 15:34:40 +0000
committerRichard Purdie <richard@ted.(none)>2009-01-02 15:34:40 +0000
commitf8a23031e2a02e5fbef63a01d33e036bc57240b3 (patch)
tree97ba7224a9a46fcd5ecec81ab3258c06bc6f9498 /meta/packages/fontconfig
parent61d8ea7a140e2e5bf77839c8ee914ae903c83de8 (diff)
downloadpoky-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.bb3
-rw-r--r--meta/packages/fontconfig/fontconfig_2.6.0.bb2
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 @@
1SECTION = "base"
2LICENSE = "BSD"
3require fontconfig_${PV}.bb 1require fontconfig_${PV}.bb
4inherit native 2inherit native
5DEPENDS = "freetype-native expat-native zlib-native" 3DEPENDS = "freetype-native expat-native zlib-native"
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
7 4
8EXTRA_OEMAKE = "" 5EXTRA_OEMAKE = ""
9EXTRA_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))]}" 6EXTRA_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"
19RCONFLICTS_fontconfig-utils = "libfontconfig-utils" 19RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
20DEBIAN_NOAUTONAME_fontconfig-utils = "1" 20DEBIAN_NOAUTONAME_fontconfig-utils = "1"
21 21
22S = "${WORKDIR}/fontconfig-${PV}"
23
24PARALLEL_MAKE = "" 22PARALLEL_MAKE = ""
25 23
26inherit autotools pkgconfig 24inherit autotools pkgconfig