summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-19 15:18:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-21 09:32:43 +0000
commit0ab67d6ede91170076470e3cc88788b1138fba16 (patch)
tree1bba6b7498c2b448ed7c2c26bd6d57335564c855
parent4883ccce1b28a37cce82ca51510250d0223f1438 (diff)
downloadpoky-0ab67d6ede91170076470e3cc88788b1138fba16.tar.gz
freetype: use autotools instead of a manual do_configure
autotools.bbclass has enough variables now that we can use it instead of hand-coding a do_configure. (From OE-Core rev: c8bd926cfa2f74ca59c379072c40322605a76bd2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/freetype/freetype_2.6.3.bb18
1 files changed, 5 insertions, 13 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.6.3.bb b/meta/recipes-graphics/freetype/freetype_2.6.3.bb
index cf6882af9e..3ed9070120 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.3.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.6.3.bb
@@ -20,6 +20,11 @@ SRC_URI[sha256sum] = "371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af54986304
20 20
21inherit autotools pkgconfig binconfig-disabled multilib_header 21inherit autotools pkgconfig binconfig-disabled multilib_header
22 22
23# Adapt autotools to work with the minimal autoconf usage in freetype
24AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix"
25CONFIGURE_SCRIPT = "${S}/configure"
26EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake"
27
23PACKAGECONFIG ??= "zlib" 28PACKAGECONFIG ??= "zlib"
24 29
25PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" 30PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
@@ -32,19 +37,6 @@ EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
32 37
33TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" 38TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
34 39
35do_configure() {
36 # Need this because although the autotools infrastructure is in
37 # builds/unix the configure script get written to ${S}, so we can't
38 # just use AUTOTOOLS_SCRIPT_PATH.
39 cd ${S}/builds/unix
40 libtoolize --force --copy
41 aclocal -I .
42 gnu-configize --force
43 autoconf
44 cd ${B}
45 oe_runconf
46}
47
48do_install_append() { 40do_install_append() {
49 oe_multilib_header freetype2/freetype/config/ftconfig.h 41 oe_multilib_header freetype2/freetype/config/ftconfig.h
50} 42}