From 0ab67d6ede91170076470e3cc88788b1138fba16 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 19 Feb 2016 15:18:45 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.6.3.bb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'meta/recipes-graphics') 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 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 } -- cgit v1.2.3-54-g00ecf