From 00472a77c5ed4891a5717e1a1591d5c8c26d94be Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 8 Feb 2015 18:53:53 -0800 Subject: Revert "libtool: avoid running automake/autoconf --version" This reverts commit 1f53edeaf9ea59dd55459a6d5a93829fb4983839. There is a better fix on upstream, will backport it. (From OE-Core rev: 600c9bb271a47674876b029a6a58ffac08add8ed) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-2.4.5.inc | 1 - .../avoid-running-automake-autoconf-version.patch | 54 ---------------------- 2 files changed, 55 deletions(-) delete mode 100644 meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch (limited to 'meta/recipes-devtools/libtool') diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc index 909c7da..88e281f 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc @@ -18,7 +18,6 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ file://fix-resolve-lt-sysroot.patch \ file://nohardcodepaths.patch \ - file://avoid-running-automake-autoconf-version.patch \ file://unwind-opt-parsing.patch \ " diff --git a/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch b/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch deleted file mode 100644 index ac2d370..0000000 --- a/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7d3b0331d91a9f80bc4bcddea929a93b07b8ef91 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 4 Feb 2015 17:14:46 -0800 -Subject: [PATCH] avoid running automake/autoconf --version - -The libtool would be very slow if run "automake/autoconf --version", for -example, when compile xz (make -j1): - -before patched: 19s -after patched: 11s - -Use plain text to instead of running them. - -Upstream-Status: Pending [Report to libtool community] - -Signed-off-by: Robert Yang ---- - build-aux/ltmain.in | 4 ++-- - libtoolize.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 0441e48..49cd39a 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -152,8 +152,8 @@ include the following information: - compiler flags: $LTCFLAGS - linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU @PACKAGE@) @VERSION@ -- automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` -- autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` -+ automake: run $AUTOMAKE --version -+ autoconf: run $AUTOCONF --version - - Report bugs to <@PACKAGE_BUGREPORT@>. - GNU @PACKAGE@ home page: <@PACKAGE_URL@>. -diff --git a/libtoolize.in b/libtoolize.in -index 684d799..e57c89b 100644 ---- a/libtoolize.in -+++ b/libtoolize.in -@@ -115,8 +115,8 @@ include the following information: - - host-triplet: @host_triplet@ - version: $progname (GNU @PACKAGE@) @VERSION@ -- automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` -- autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` -+ automake: run $AUTOMAKE --version -+ autoconf: run $AUTOCONF --version - - Report bugs to <@PACKAGE_BUGREPORT@>. - GNU @PACKAGE@ home page: <@PACKAGE_URL@>. --- -1.7.9.5 - -- cgit v1.1