summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-12 22:33:31 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-13 22:06:24 +0000
commit357282e2111fa6b84b34185d9916b0c17119480c (patch)
tree4fa5e2ed4f721233ebed4044bd1fae91c807706a
parent88872c05b539521ad152576259adbb9fac853ce6 (diff)
downloadpoky-357282e2111fa6b84b34185d9916b0c17119480c.tar.gz
freetype: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/freetype/freetype-2.3.5/configure.patch (renamed from meta/packages/freetype/files/configure.patch)0
-rw-r--r--meta/packages/freetype/freetype-2.3.5/no-hardcode.patch (renamed from meta/packages/freetype/files/no-hardcode.patch)0
-rw-r--r--meta/packages/freetype/freetype-native_2.3.5.bb9
-rw-r--r--meta/packages/freetype/freetype_2.3.5.bb9
4 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/freetype/files/configure.patch b/meta/packages/freetype/freetype-2.3.5/configure.patch
index f11cf96be0..f11cf96be0 100644
--- a/meta/packages/freetype/files/configure.patch
+++ b/meta/packages/freetype/freetype-2.3.5/configure.patch
diff --git a/meta/packages/freetype/files/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch
index 44ae450a14..44ae450a14 100644
--- a/meta/packages/freetype/files/no-hardcode.patch
+++ b/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch
diff --git a/meta/packages/freetype/freetype-native_2.3.5.bb b/meta/packages/freetype/freetype-native_2.3.5.bb
deleted file mode 100644
index f44ca4b55f..0000000000
--- a/meta/packages/freetype/freetype-native_2.3.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require freetype_${PV}.bb
2inherit native
3
4EXTRA_OEMAKE=
5
6do_configure() {
7 (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
8 oe_runconf
9}
diff --git a/meta/packages/freetype/freetype_2.3.5.bb b/meta/packages/freetype/freetype_2.3.5.bb
index f5934bd662..5bbbd7d657 100644
--- a/meta/packages/freetype/freetype_2.3.5.bb
+++ b/meta/packages/freetype/freetype_2.3.5.bb
@@ -14,6 +14,7 @@ inherit autotools pkgconfig binconfig
14 14
15LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" 15LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
16EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" 16EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
17EXTRA_OEMAKE_virtclass-native = ""
17EXTRA_OECONF = "--without-zlib" 18EXTRA_OECONF = "--without-zlib"
18 19
19do_configure() { 20do_configure() {
@@ -26,9 +27,17 @@ do_configure() {
26 oe_runconf 27 oe_runconf
27} 28}
28 29
30do_configure_virtclass-native() {
31 (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
32 oe_runconf
33}
34
29do_compile_prepend() { 35do_compile_prepend() {
30 ${BUILD_CC} -o objs/apinames src/tools/apinames.c 36 ${BUILD_CC} -o objs/apinames src/tools/apinames.c
31} 37}
32 38
33FILES_${PN} = "${libdir}/lib*${SOLIBS}" 39FILES_${PN} = "${libdir}/lib*${SOLIBS}"
34FILES_${PN}-dev += "${bindir}" 40FILES_${PN}-dev += "${bindir}"
41
42BBCLASSEXTEND = "native"
43