diff options
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.6.inc (renamed from meta/recipes-devtools/libtool/libtool-2.4.5.inc) | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-native_2.4.6.bb (renamed from meta/recipes-devtools/libtool/libtool-native_2.4.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch | 71 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool_2.4.6.bb (renamed from meta/recipes-devtools/libtool/libtool_2.4.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb (renamed from meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb) | 0 |
6 files changed, 2 insertions, 74 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc index 0f6bdc83ee..ff5abcb239 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc | |||
@@ -19,11 +19,10 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ | |||
19 | file://fix-resolve-lt-sysroot.patch \ | 19 | file://fix-resolve-lt-sysroot.patch \ |
20 | file://nohardcodepaths.patch \ | 20 | file://nohardcodepaths.patch \ |
21 | file://unwind-opt-parsing.patch \ | 21 | file://unwind-opt-parsing.patch \ |
22 | file://libtool-don-t-execute-automake-and-autoconf-on-every.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54" | 24 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" |
26 | SRC_URI[sha256sum] = "509cb49c7de14ce7eaf88993cf09fd4071882699dfd874c2e95b31ab107d6987" | 25 | SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" |
27 | 26 | ||
28 | do_compile_prepend () { | 27 | do_compile_prepend () { |
29 | # Sometimes this file doesn't get rebuilt, force the issue | 28 | # Sometimes this file doesn't get rebuilt, force the issue |
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb index 847880270d..847880270d 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb | |||
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.5.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb index 4c5218ade0..4c5218ade0 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.5.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb | |||
diff --git a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch deleted file mode 100644 index 87ffae12ee..0000000000 --- a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 408cfb9c5fa8a666917167ffb806cb19deded429 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Gary V. Vaughan" <gary@gnu.org> | ||
3 | Date: Fri, 6 Feb 2015 12:58:34 +0000 | ||
4 | Subject: [PATCH] libtool: don't execute automake and autoconf on every | ||
5 | invocation. | ||
6 | |||
7 | Regression from 2.4.2 was causing noticable slow-down in builds | ||
8 | that call libtool many times. | ||
9 | * build-aux/ltmain.in (func_help): Override func_help() from | ||
10 | gl/build-aux/options-parser to only run automake --version and | ||
11 | autoconf --version when libtool --help is executed on the command | ||
12 | line. | ||
13 | * NO-THANKS: Add Robert Yang. | ||
14 | Reported by Robert Yang | ||
15 | |||
16 | Signed-off-by: Gary V. Vaughan <gary@gnu.org> | ||
17 | |||
18 | Updated: Change NO-THANKS to THANKS to apply the patch since upstream | ||
19 | renamed it. | ||
20 | |||
21 | Upstream-Stauts: Backport | ||
22 | |||
23 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
24 | |||
25 | --- | ||
26 | THANKS | 1 + | ||
27 | build-aux/ltmain.in | 9 ++++++++- | ||
28 | 2 files changed, 9 insertions(+), 1 deletion(-) | ||
29 | |||
30 | diff --git a/THANKS b/THANKS | ||
31 | index 0ab162d..aa7aa8c 100644 | ||
32 | --- a/THANKS | ||
33 | +++ b/THANKS | ||
34 | @@ -258,6 +258,7 @@ Robert Garron Robert.Garron@Access3000.net | ||
35 | Robert Millan rmh@aybabtu.com | ||
36 | Robert Ă–gren lists@roboros.com | ||
37 | Roberto Bagnara bagnara@cs.unipr.it | ||
38 | +Robert Yang liezhi.yang@windriver.com | ||
39 | Roger Cornelius rac@tenzing.org | ||
40 | Roland Mainz roland.mainz@nrubsig.org | ||
41 | Roumen Petrov bugtrack@roumenpetrov.info | ||
42 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
43 | index 46a0bb5..d5cf07a 100644 | ||
44 | --- a/build-aux/ltmain.in | ||
45 | +++ b/build-aux/ltmain.in | ||
46 | @@ -127,7 +127,12 @@ usage_message="Options: | ||
47 | " | ||
48 | |||
49 | # Additional text appended to 'usage_message' in response to '--help'. | ||
50 | -long_help_message=$long_help_message" | ||
51 | +func_help () | ||
52 | +{ | ||
53 | + $debug_cmd | ||
54 | + | ||
55 | + func_usage_message | ||
56 | + $ECHO "$long_help_message | ||
57 | |||
58 | MODE must be one of the following: | ||
59 | |||
60 | @@ -158,6 +163,8 @@ include the following information: | ||
61 | Report bugs to <@PACKAGE_BUGREPORT@>. | ||
62 | GNU @PACKAGE@ home page: <@PACKAGE_URL@>. | ||
63 | General help using GNU software: <http://www.gnu.org/gethelp/>." | ||
64 | + exit 0 | ||
65 | +} | ||
66 | |||
67 | |||
68 | # func_lo2o OBJECT-NAME | ||
69 | -- | ||
70 | 1.7.9.5 | ||
71 | |||
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.5.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb index 45f1b2f3a9..45f1b2f3a9 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.5.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb | |||
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb index 508eade326..508eade326 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb | |||