diff options
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch | 54 |
2 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc index 909c7da424..88e281f678 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 \ | |||
| 18 | file://dont-depend-on-help2man.patch \ | 18 | file://dont-depend-on-help2man.patch \ |
| 19 | file://fix-resolve-lt-sysroot.patch \ | 19 | file://fix-resolve-lt-sysroot.patch \ |
| 20 | file://nohardcodepaths.patch \ | 20 | file://nohardcodepaths.patch \ |
| 21 | file://avoid-running-automake-autoconf-version.patch \ | ||
| 22 | file://unwind-opt-parsing.patch \ | 21 | file://unwind-opt-parsing.patch \ |
| 23 | " | 22 | " |
| 24 | 23 | ||
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 ac2d370db4..0000000000 --- a/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From 7d3b0331d91a9f80bc4bcddea929a93b07b8ef91 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Wed, 4 Feb 2015 17:14:46 -0800 | ||
| 4 | Subject: [PATCH] avoid running automake/autoconf --version | ||
| 5 | |||
| 6 | The libtool would be very slow if run "automake/autoconf --version", for | ||
| 7 | example, when compile xz (make -j1): | ||
| 8 | |||
| 9 | before patched: 19s | ||
| 10 | after patched: 11s | ||
| 11 | |||
| 12 | Use plain text to instead of running them. | ||
| 13 | |||
| 14 | Upstream-Status: Pending [Report to libtool community] | ||
| 15 | |||
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 17 | --- | ||
| 18 | build-aux/ltmain.in | 4 ++-- | ||
| 19 | libtoolize.in | 4 ++-- | ||
| 20 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
| 23 | index 0441e48..49cd39a 100644 | ||
| 24 | --- a/build-aux/ltmain.in | ||
| 25 | +++ b/build-aux/ltmain.in | ||
| 26 | @@ -152,8 +152,8 @@ include the following information: | ||
| 27 | compiler flags: $LTCFLAGS | ||
| 28 | linker: $LD (gnu? $with_gnu_ld) | ||
| 29 | version: $progname (GNU @PACKAGE@) @VERSION@ | ||
| 30 | - automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | ||
| 31 | - autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | ||
| 32 | + automake: run $AUTOMAKE --version | ||
| 33 | + autoconf: run $AUTOCONF --version | ||
| 34 | |||
| 35 | Report bugs to <@PACKAGE_BUGREPORT@>. | ||
| 36 | GNU @PACKAGE@ home page: <@PACKAGE_URL@>. | ||
| 37 | diff --git a/libtoolize.in b/libtoolize.in | ||
| 38 | index 684d799..e57c89b 100644 | ||
| 39 | --- a/libtoolize.in | ||
| 40 | +++ b/libtoolize.in | ||
| 41 | @@ -115,8 +115,8 @@ include the following information: | ||
| 42 | |||
| 43 | host-triplet: @host_triplet@ | ||
| 44 | version: $progname (GNU @PACKAGE@) @VERSION@ | ||
| 45 | - automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | ||
| 46 | - autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | ||
| 47 | + automake: run $AUTOMAKE --version | ||
| 48 | + autoconf: run $AUTOCONF --version | ||
| 49 | |||
| 50 | Report bugs to <@PACKAGE_BUGREPORT@>. | ||
| 51 | GNU @PACKAGE@ home page: <@PACKAGE_URL@>. | ||
| 52 | -- | ||
| 53 | 1.7.9.5 | ||
| 54 | |||
