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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/freetype/freetype_2.6.3.bb b/meta/recipes-graphics/freetype/freetype_2.6.3.bb
index cf6882af9ecb9474dba9a66af9cbf3fc7ba84114..3ed90701204946ea0eedc3c788fd27dc4cf628b3 100644 (file)
--- 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
 
 inherit autotools pkgconfig binconfig-disabled multilib_header
 
+# Adapt autotools to work with the minimal autoconf usage in freetype
+AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix"
+CONFIGURE_SCRIPT = "${S}/configure"
+EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake"
+
 PACKAGECONFIG ??= "zlib"
 
 PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
@@ -32,19 +37,6 @@ EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
 
 TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
 
-do_configure() {
-       # Need this because although the autotools infrastructure is in
-       # builds/unix the configure script get written to ${S}, so we can't
-       # just use AUTOTOOLS_SCRIPT_PATH.
-       cd ${S}/builds/unix
-       libtoolize --force --copy
-       aclocal -I .
-       gnu-configize --force
-       autoconf
-       cd ${B}
-       oe_runconf
-}
-
 do_install_append() {
        oe_multilib_header freetype2/freetype/config/ftconfig.h
 }