diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-17 18:00:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-23 12:13:49 +0000 |
commit | ff7b41573842a403c81f58bee41fc8163a9d7754 (patch) | |
tree | 942642ee97ef156870d3847cefd7fb4fe7aae49a /meta | |
parent | 3d62a6cc5c7859a16358d73938752dc8ca4e51ea (diff) | |
download | poky-ff7b41573842a403c81f58bee41fc8163a9d7754.tar.gz |
libtool: Upgrade 2.4.6 -> 2.4.7
Libtool made a release after many years. Update to it, allowing us to drop two
backported patches. We also drop a performance optimistion patch since it is
too invasive to maintain separately.
(From OE-Core rev: b5d13cbdded0f71fd4b847066434d30e8a39c9ce)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
21 files changed, 102 insertions, 499 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.7.inc index ad6f5e6b6e..a07df720ac 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.7.inc | |||
@@ -17,20 +17,16 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ | |||
17 | file://dont-depend-on-help2man.patch \ | 17 | file://dont-depend-on-help2man.patch \ |
18 | file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ | 18 | file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ |
19 | file://nohardcodepaths.patch \ | 19 | file://nohardcodepaths.patch \ |
20 | file://unwind-opt-parsing.patch \ | ||
21 | file://0007-libtool-Fix-support-for-NIOS2-processor.patch \ | 20 | file://0007-libtool-Fix-support-for-NIOS2-processor.patch \ |
22 | file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ | 21 | file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ |
23 | file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ | 22 | file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ |
24 | file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \ | 23 | file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \ |
25 | file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \ | 24 | file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \ |
26 | file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \ | 25 | file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \ |
27 | file://libool.m4-add-ARFLAGS-variable.patch \ | ||
28 | file://ARFLAGS-use-cr-instead-of-cru-by-default.patch \ | ||
29 | file://0001-ltmain.in-Parse-additional-clang-options.patch \ | 26 | file://0001-ltmain.in-Parse-additional-clang-options.patch \ |
30 | " | 27 | " |
31 | 28 | ||
32 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" | 29 | SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" |
33 | SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" | ||
34 | 30 | ||
35 | do_compile:prepend () { | 31 | do_compile:prepend () { |
36 | # Sometimes this file doesn't get rebuilt, force the issue | 32 | # Sometimes this file doesn't get rebuilt, force the issue |
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb index 93f1dd7825..93f1dd7825 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb | |||
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb index 19024f7830..19024f7830 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch index eeb5ebf416..4c4d0547a3 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch | |||
@@ -15,9 +15,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] | 15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] |
16 | 16 | ||
17 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 17 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
18 | index 96b37003..3d5dcd0a 100644 | ||
18 | --- a/build-aux/ltmain.in | 19 | --- a/build-aux/ltmain.in |
19 | +++ b/build-aux/ltmain.in | 20 | +++ b/build-aux/ltmain.in |
20 | @@ -2356,8 +2356,14 @@ func_mode_install () | 21 | @@ -2378,8 +2378,14 @@ func_mode_install () |
21 | func_append dir "$objdir" | 22 | func_append dir "$objdir" |
22 | 23 | ||
23 | if test -n "$relink_command"; then | 24 | if test -n "$relink_command"; then |
@@ -33,3 +34,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | |||
33 | 34 | ||
34 | # Don't allow the user to place us outside of our expected | 35 | # Don't allow the user to place us outside of our expected |
35 | # location b/c this prevents finding dependent libraries that | 36 | # location b/c this prevents finding dependent libraries that |
37 | -- | ||
38 | 2.25.1 | ||
39 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch index d59b5a834e..0285c143d2 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch | |||
@@ -1,6 +1,4 @@ | |||
1 | From c3b90d6107a1b638477d5f4dcee48af289647af7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | 1 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 9 Mar 2022 12:52:51 -0800 | ||
4 | Subject: [PATCH] ltmain.in: Parse additional clang options | 2 | Subject: [PATCH] ltmain.in: Parse additional clang options |
5 | 3 | ||
6 | clang uses -rtlib and --unwindlib to select proper compiler runtime in | 4 | clang uses -rtlib and --unwindlib to select proper compiler runtime in |
@@ -9,29 +7,22 @@ ldflags | |||
9 | 7 | ||
10 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | ||
13 | build-aux/ltmain.in | 5 ++++- | ||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
15 | 10 | ||
16 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 11 | Index: libtool-2.4.7/build-aux/ltmain.in |
17 | index 6a7bb72..c355c0c 100644 | 12 | =================================================================== |
18 | --- a/build-aux/ltmain.in | 13 | --- libtool-2.4.7.orig/build-aux/ltmain.in |
19 | +++ b/build-aux/ltmain.in | 14 | +++ libtool-2.4.7/build-aux/ltmain.in |
20 | @@ -5423,10 +5423,13 @@ func_mode_link () | 15 | @@ -5420,10 +5420,12 @@ func_mode_link () |
21 | # --sysroot=* for sysroot support | 16 | # -fsanitize=* Clang/GCC memory and address sanitizer |
22 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | 17 | # -fuse-ld=* Linker select flags for GCC |
23 | # -stdlib=* select c++ std lib with clang | 18 | # -f*-prefix-map* needed for lto linking |
24 | + # -rtlib=* select c runtime lib with clang | 19 | + # -rtlib=* select c runtime lib with clang |
25 | + # --unwindlib=* select unwinder library with clang | 20 | + # --unwindlib=* select unwinder library with clang |
26 | # -f*-prefix-map* needed for lto linking | 21 | # -Wa,* Pass flags directly to the assembler |
27 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 22 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
28 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 23 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
29 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-f*-prefix-map*) | 24 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
30 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 25 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ |
31 | + -rtlib=*|--unwindlib=*|-f*-prefix-map*) | 26 | -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) |
32 | func_quote_for_eval "$arg" | 27 | func_quote_arg pretty "$arg" |
33 | arg=$func_quote_for_eval_result | 28 | arg=$func_quote_arg_result |
34 | func_append compile_command " $arg" | ||
35 | -- | ||
36 | 2.35.1 | ||
37 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch index 6da283959e..1920e2e6db 100644 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch | |||
@@ -13,13 +13,14 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] | 14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] |
15 | 15 | ||
16 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 16 | Index: libtool-2.4.7/m4/libtool.m4 |
17 | --- a/m4/libtool.m4 | 17 | =================================================================== |
18 | +++ b/m4/libtool.m4 | 18 | --- libtool-2.4.7.orig/m4/libtool.m4 |
19 | @@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) | 19 | +++ libtool-2.4.7/m4/libtool.m4 |
20 | # ---------------- | 20 | @@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr |
21 | AC_DEFUN([_LT_WITH_SYSROOT], | 21 | AC_DEFUN([_LT_WITH_SYSROOT], |
22 | [AC_MSG_CHECKING([for sysroot]) | 22 | [m4_require([_LT_DECL_SED])dnl |
23 | AC_MSG_CHECKING([for sysroot]) | ||
23 | -AC_ARG_WITH([sysroot], | 24 | -AC_ARG_WITH([sysroot], |
24 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], | 25 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], |
25 | +AC_ARG_WITH([libtool-sysroot], | 26 | +AC_ARG_WITH([libtool-sysroot], |
@@ -40,8 +41,8 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
40 | fi | 41 | fi |
41 | ;; #( | 42 | ;; #( |
42 | /*) | 43 | /*) |
43 | - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | 44 | - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` |
44 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | 45 | + lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` |
45 | ;; #( | 46 | ;; #( |
46 | no|'') | 47 | no|'') |
47 | ;; #( | 48 | ;; #( |
@@ -51,10 +52,11 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
51 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | 52 | AC_MSG_ERROR([The sysroot must be an absolute path.]) |
52 | ;; | 53 | ;; |
53 | esac | 54 | esac |
54 | diff --git a/tests/sysroot.at b/tests/sysroot.at | 55 | Index: libtool-2.4.7/tests/sysroot.at |
55 | --- a/tests/sysroot.at | 56 | =================================================================== |
56 | +++ b/tests/sysroot.at | 57 | --- libtool-2.4.7.orig/tests/sysroot.at |
57 | @@ -64,7 +64,7 @@ while read file; do | 58 | +++ libtool-2.4.7/tests/sysroot.at |
59 | @@ -65,7 +65,7 @@ while read file; do | ||
58 | done]) | 60 | done]) |
59 | 61 | ||
60 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 62 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -63,7 +65,7 @@ diff --git a/tests/sysroot.at b/tests/sysroot.at | |||
63 | 65 | ||
64 | #??? | 66 | #??? |
65 | if test PATH = "$shlibpath_var"; then | 67 | if test PATH = "$shlibpath_var"; then |
66 | @@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) | 68 | @@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign]) |
67 | AC_PROG_CC | 69 | AC_PROG_CC |
68 | AC_CONFIG_SRCDIR([lib2.c]) | 70 | AC_CONFIG_SRCDIR([lib2.c]) |
69 | LT_INIT | 71 | LT_INIT |
@@ -72,7 +74,7 @@ diff --git a/tests/sysroot.at b/tests/sysroot.at | |||
72 | AC_SUBST([sysroot]) | 74 | AC_SUBST([sysroot]) |
73 | AC_OUTPUT(Makefile) | 75 | AC_OUTPUT(Makefile) |
74 | ]]) | 76 | ]]) |
75 | @@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign]) | 77 | @@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign]) |
76 | AC_PROG_CC | 78 | AC_PROG_CC |
77 | AC_CONFIG_SRCDIR([prog.c]) | 79 | AC_CONFIG_SRCDIR([prog.c]) |
78 | LT_INIT | 80 | LT_INIT |
diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch index 0103a00451..07c7f911e0 100644 --- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch +++ b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch | |||
@@ -11,9 +11,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] | 11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] |
12 | 12 | ||
13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
14 | index 3d5dcd0a..2c994612 100644 | ||
14 | --- a/build-aux/ltmain.in | 15 | --- a/build-aux/ltmain.in |
15 | +++ b/build-aux/ltmain.in | 16 | +++ b/build-aux/ltmain.in |
16 | @@ -6421,7 +6421,7 @@ func_mode_link () | 17 | @@ -6475,7 +6475,7 @@ func_mode_link () |
17 | fi | 18 | fi |
18 | else | 19 | else |
19 | # We cannot seem to hardcode it, guess we'll fake it. | 20 | # We cannot seem to hardcode it, guess we'll fake it. |
@@ -22,3 +23,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | |||
22 | # Try looking first in the location we're being installed to. | 23 | # Try looking first in the location we're being installed to. |
23 | if test -n "$inst_prefix_dir"; then | 24 | if test -n "$inst_prefix_dir"; then |
24 | case $libdir in | 25 | case $libdir in |
26 | -- | ||
27 | 2.25.1 | ||
28 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch index 21b3dfe306..4fcf456b0b 100644 --- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch +++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch | |||
@@ -10,23 +10,24 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] | 10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] |
11 | 11 | ||
12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
13 | index 2c994612..96238350 100644 | ||
13 | --- a/build-aux/ltmain.in | 14 | --- a/build-aux/ltmain.in |
14 | +++ b/build-aux/ltmain.in | 15 | +++ b/build-aux/ltmain.in |
15 | @@ -7569,9 +7569,11 @@ EOF | 16 | @@ -7654,9 +7654,11 @@ EOF |
16 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath | 17 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath |
17 | for libdir in $rpath; do | 18 | for libdir in $rpath; do |
18 | if test -n "$hardcode_libdir_flag_spec"; then | 19 | if test -n "$hardcode_libdir_flag_spec"; then |
19 | + func_replace_sysroot "$libdir" | 20 | + func_replace_sysroot "$libdir" |
20 | + libdir=$func_replace_sysroot_result | 21 | + libdir=$func_replace_sysroot_result |
21 | + func_stripname '=' '' "$libdir" | 22 | + func_stripname '=' '' "$libdir" |
22 | + libdir=$func_stripname_result | 23 | + libdir=$func_stripname_result |
23 | if test -n "$hardcode_libdir_separator"; then | 24 | if test -n "$hardcode_libdir_separator"; then |
24 | - func_replace_sysroot "$libdir" | 25 | - func_replace_sysroot "$libdir" |
25 | - libdir=$func_replace_sysroot_result | 26 | - libdir=$func_replace_sysroot_result |
26 | if test -z "$hardcode_libdirs"; then | 27 | if test -z "$hardcode_libdirs"; then |
27 | hardcode_libdirs=$libdir | 28 | hardcode_libdirs=$libdir |
28 | else | 29 | else |
29 | @@ -8301,6 +8303,10 @@ EOF | 30 | @@ -8386,6 +8388,10 @@ EOF |
30 | hardcode_libdirs= | 31 | hardcode_libdirs= |
31 | for libdir in $compile_rpath $finalize_rpath; do | 32 | for libdir in $compile_rpath $finalize_rpath; do |
32 | if test -n "$hardcode_libdir_flag_spec"; then | 33 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -37,7 +38,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | |||
37 | if test -n "$hardcode_libdir_separator"; then | 38 | if test -n "$hardcode_libdir_separator"; then |
38 | if test -z "$hardcode_libdirs"; then | 39 | if test -z "$hardcode_libdirs"; then |
39 | hardcode_libdirs=$libdir | 40 | hardcode_libdirs=$libdir |
40 | @@ -8352,6 +8358,10 @@ EOF | 41 | @@ -8437,6 +8443,10 @@ EOF |
41 | hardcode_libdirs= | 42 | hardcode_libdirs= |
42 | for libdir in $finalize_rpath; do | 43 | for libdir in $finalize_rpath; do |
43 | if test -n "$hardcode_libdir_flag_spec"; then | 44 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -48,3 +49,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | |||
48 | if test -n "$hardcode_libdir_separator"; then | 49 | if test -n "$hardcode_libdir_separator"; then |
49 | if test -z "$hardcode_libdirs"; then | 50 | if test -z "$hardcode_libdirs"; then |
50 | hardcode_libdirs=$libdir | 51 | hardcode_libdirs=$libdir |
52 | -- | ||
53 | 2.25.1 | ||
54 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch index 50d47d9f7a..589a33e8a6 100644 --- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch +++ b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch | |||
@@ -12,10 +12,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
12 | 12 | ||
13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] | 13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] |
14 | 14 | ||
15 | diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in | 15 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
16 | --- b/build-aux/ltmain.in | 16 | index 96238350..6fb58ed2 100644 |
17 | +++ b/build-aux/ltmain.in 2012-08-22 11:01:34.191345989 -0700 | 17 | --- a/build-aux/ltmain.in |
18 | @@ -7286,8 +7286,16 @@ | 18 | +++ b/build-aux/ltmain.in |
19 | @@ -7672,8 +7672,16 @@ EOF | ||
19 | esac | 20 | esac |
20 | fi | 21 | fi |
21 | else | 22 | else |
@@ -34,7 +35,7 @@ diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in | |||
34 | fi | 35 | fi |
35 | elif test -n "$runpath_var"; then | 36 | elif test -n "$runpath_var"; then |
36 | case "$perm_rpath " in | 37 | case "$perm_rpath " in |
37 | @@ -8019,8 +8027,16 @@ | 38 | @@ -8406,8 +8414,16 @@ EOF |
38 | esac | 39 | esac |
39 | fi | 40 | fi |
40 | else | 41 | else |
@@ -53,7 +54,7 @@ diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in | |||
53 | fi | 54 | fi |
54 | elif test -n "$runpath_var"; then | 55 | elif test -n "$runpath_var"; then |
55 | case "$perm_rpath " in | 56 | case "$perm_rpath " in |
56 | @@ -8070,8 +8086,14 @@ | 57 | @@ -8461,8 +8477,14 @@ EOF |
57 | esac | 58 | esac |
58 | fi | 59 | fi |
59 | else | 60 | else |
@@ -70,3 +71,6 @@ diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in | |||
70 | fi | 71 | fi |
71 | elif test -n "$runpath_var"; then | 72 | elif test -n "$runpath_var"; then |
72 | case "$finalize_perm_rpath " in | 73 | case "$finalize_perm_rpath " in |
74 | -- | ||
75 | 2.25.1 | ||
76 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch index 999971241f..a221dab528 100644 --- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch +++ b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch | |||
@@ -13,11 +13,11 @@ http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00018.html] | 14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00018.html] |
15 | 15 | ||
16 | --- | 16 | Index: libtool-2.4.7/m4/libtool.m4 |
17 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 17 | =================================================================== |
18 | --- a/m4/libtool.m4 | 18 | --- libtool-2.4.7.orig/m4/libtool.m4 |
19 | +++ b/m4/libtool.m4 | 19 | +++ libtool-2.4.7/m4/libtool.m4 |
20 | @@ -1225,16 +1225,21 @@ dnl lt_sysroot will always be passed unquoted. We quote it here | 20 | @@ -1254,16 +1254,20 @@ dnl lt_sysroot will always be passed unq |
21 | dnl in case the user passed a directory name. | 21 | dnl in case the user passed a directory name. |
22 | lt_sysroot= | 22 | lt_sysroot= |
23 | case $with_libtool_sysroot in #( | 23 | case $with_libtool_sysroot in #( |
@@ -25,8 +25,7 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
25 | + no) | 25 | + no) |
26 | if test yes = "$GCC"; then | 26 | if test yes = "$GCC"; then |
27 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | 27 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
28 | + # Treat "/" the same a an unset sysroot. It seems to be more | 28 | + # Treat "/" the same a an unset sysroot. |
29 | + # compatible across host platforms that way!? | ||
30 | + if test "$lt_sysroot" = /; then | 29 | + if test "$lt_sysroot" = /; then |
31 | + lt_sysroot= | 30 | + lt_sysroot= |
32 | + fi | 31 | + fi |
@@ -35,7 +34,7 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
35 | + yes|''|/) | 34 | + yes|''|/) |
36 | + ;; #( | 35 | + ;; #( |
37 | /*) | 36 | /*) |
38 | lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | 37 | lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` |
39 | ;; #( | 38 | ;; #( |
40 | - no|'') | 39 | - no|'') |
41 | - ;; #( | 40 | - ;; #( |
diff --git a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch index 395464e908..277afe0af6 100644 --- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch +++ b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch | |||
@@ -15,15 +15,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
15 | 15 | ||
16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html] | 16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html] |
17 | 17 | ||
18 | --- | ||
19 | build-aux/ltmain.in | 20 ++++++++++++++++++++ | ||
20 | 1 file changed, 20 insertions(+) | ||
21 | |||
22 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 18 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
23 | index d5cf07a..4164284 100644 | 19 | index 6fb58ed2..606f17be 100644 |
24 | --- a/build-aux/ltmain.in | 20 | --- a/build-aux/ltmain.in |
25 | +++ b/build-aux/ltmain.in | 21 | +++ b/build-aux/ltmain.in |
26 | @@ -504,6 +504,12 @@ libtool_validate_options () | 22 | @@ -519,6 +519,12 @@ libtool_validate_options () |
27 | test : = "$debug_cmd" || func_append preserve_args " --debug" | 23 | test : = "$debug_cmd" || func_append preserve_args " --debug" |
28 | 24 | ||
29 | case $host in | 25 | case $host in |
@@ -36,7 +32,7 @@ index d5cf07a..4164284 100644 | |||
36 | # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 | 32 | # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 |
37 | # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 | 33 | # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 |
38 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) | 34 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) |
39 | @@ -6220,6 +6226,15 @@ func_mode_link () | 35 | @@ -6246,6 +6252,15 @@ func_mode_link () |
40 | if test -n "$library_names" && | 36 | if test -n "$library_names" && |
41 | { test no = "$use_static_libs" || test -z "$old_library"; }; then | 37 | { test no = "$use_static_libs" || test -z "$old_library"; }; then |
42 | case $host in | 38 | case $host in |
@@ -52,7 +48,7 @@ index d5cf07a..4164284 100644 | |||
52 | *cygwin* | *mingw* | *cegcc* | *os2*) | 48 | *cygwin* | *mingw* | *cegcc* | *os2*) |
53 | # No point in relinking DLLs because paths are not encoded | 49 | # No point in relinking DLLs because paths are not encoded |
54 | func_append notinst_deplibs " $lib" | 50 | func_append notinst_deplibs " $lib" |
55 | @@ -6290,6 +6305,11 @@ func_mode_link () | 51 | @@ -6316,6 +6331,11 @@ func_mode_link () |
56 | elif test -n "$soname_spec"; then | 52 | elif test -n "$soname_spec"; then |
57 | # bleh windows | 53 | # bleh windows |
58 | case $host in | 54 | case $host in |
@@ -65,5 +61,5 @@ index d5cf07a..4164284 100644 | |||
65 | func_arith $current - $age | 61 | func_arith $current - $age |
66 | major=$func_arith_result | 62 | major=$func_arith_result |
67 | -- | 63 | -- |
68 | 2.5.1 | 64 | 2.25.1 |
69 | 65 | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch index afffdb9fd4..83c74373ae 100644 --- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch +++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch | |||
@@ -1,6 +1,4 @@ | |||
1 | From b9993338080325a6e2b2ec94ca0ece80e7fa3fb6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | 1 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 26 Jan 2019 12:54:26 -0800 | ||
4 | Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries | 2 | Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries |
5 | 3 | ||
6 | Libtool checks only for libraries linked as -l* when trying to | 4 | Libtool checks only for libraries linked as -l* when trying to |
@@ -16,15 +14,12 @@ https://crbug.com/749263 | |||
16 | https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 | 14 | https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 |
17 | 15 | ||
18 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] | 16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] |
19 | --- | ||
20 | m4/libtool.m4 | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | 17 | ||
23 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 18 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
24 | index d0389a0..9619c57 100644 | 19 | index 180dd9d1..022c1292 100644 |
25 | --- a/m4/libtool.m4 | 20 | --- a/m4/libtool.m4 |
26 | +++ b/m4/libtool.m4 | 21 | +++ b/m4/libtool.m4 |
27 | @@ -7536,7 +7536,7 @@ if AC_TRY_EVAL(ac_compile); then | 22 | @@ -7560,7 +7560,7 @@ if AC_TRY_EVAL(ac_compile); then |
28 | for p in `eval "$output_verbose_link_cmd"`; do | 23 | for p in `eval "$output_verbose_link_cmd"`; do |
29 | case $prev$p in | 24 | case $prev$p in |
30 | 25 | ||
@@ -34,5 +29,5 @@ index d0389a0..9619c57 100644 | |||
34 | # Remove the space. | 29 | # Remove the space. |
35 | if test x-L = "$p" || | 30 | if test x-L = "$p" || |
36 | -- | 31 | -- |
37 | 2.20.1 | 32 | 2.25.1 |
38 | 33 | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch index 348cd3c1ae..437c09fa6d 100644 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch | |||
@@ -13,15 +13,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00015.html] | 14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00015.html] |
15 | 15 | ||
16 | --- | ||
17 | Makefile.am | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | 16 | diff --git a/Makefile.am b/Makefile.am |
21 | index 4142c90..fe1a9fc 100644 | 17 | index 6b546092..84795d87 100644 |
22 | --- a/Makefile.am | 18 | --- a/Makefile.am |
23 | +++ b/Makefile.am | 19 | +++ b/Makefile.am |
24 | @@ -365,7 +365,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) | 20 | @@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) |
25 | $(lt_aclocal_m4): $(lt_aclocal_m4_deps) | 21 | $(lt_aclocal_m4): $(lt_aclocal_m4_deps) |
26 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 | 22 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 |
27 | 23 | ||
@@ -31,5 +27,5 @@ index 4142c90..fe1a9fc 100644 | |||
31 | 27 | ||
32 | $(lt_config_h_in): $(lt_configure_deps) | 28 | $(lt_config_h_in): $(lt_configure_deps) |
33 | -- | 29 | -- |
34 | 2.29.2 | 30 | 2.25.1 |
35 | 31 | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch index cd963ef1be..a92e22905f 100644 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch | |||
@@ -14,15 +14,12 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00020.html] | 14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00020.html] |
15 | 15 | ||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
17 | --- | ||
18 | Makefile.am | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | 17 | ||
21 | diff --git a/Makefile.am b/Makefile.am | 18 | diff --git a/Makefile.am b/Makefile.am |
22 | index 2752ecc..29950db 100644 | 19 | index 84795d87..8c9949ed 100644 |
23 | --- a/Makefile.am | 20 | --- a/Makefile.am |
24 | +++ b/Makefile.am | 21 | +++ b/Makefile.am |
25 | @@ -328,7 +328,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ | 22 | @@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ |
26 | $(lt_obsolete_m4) \ | 23 | $(lt_obsolete_m4) \ |
27 | $(stamp_mk) | 24 | $(stamp_mk) |
28 | 25 | ||
@@ -32,5 +29,5 @@ index 2752ecc..29950db 100644 | |||
32 | 29 | ||
33 | # Don't let unused scripts leak into the libltdl Makefile | 30 | # Don't let unused scripts leak into the libltdl Makefile |
34 | -- | 31 | -- |
35 | 2.29.2 | 32 | 2.25.1 |
36 | 33 | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch index b121a3c750..4945533bad 100644 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch | |||
@@ -8,19 +8,21 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html] | 9 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html] |
10 | 10 | ||
11 | Index: libtool-2.4.6/build-aux/ltmain.in | 11 | Index: libtool-2.4.7/build-aux/ltmain.in |
12 | =================================================================== | 12 | =================================================================== |
13 | --- libtool-2.4.6.orig/build-aux/ltmain.in | 13 | --- libtool-2.4.7.orig/build-aux/ltmain.in |
14 | +++ libtool-2.4.6/build-aux/ltmain.in | 14 | +++ libtool-2.4.7/build-aux/ltmain.in |
15 | @@ -5424,9 +5424,10 @@ func_mode_link () | 15 | @@ -5419,11 +5419,12 @@ func_mode_link () |
16 | # --sysroot=* for sysroot support | ||
17 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | ||
18 | # -stdlib=* select c++ std lib with clang | 16 | # -stdlib=* select c++ std lib with clang |
17 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
18 | # -fuse-ld=* Linker select flags for GCC | ||
19 | + # -f*-prefix-map* needed for lto linking | 19 | + # -f*-prefix-map* needed for lto linking |
20 | # -Wa,* Pass flags directly to the assembler | ||
20 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 21 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
21 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 22 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
22 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) | 23 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
23 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-f*-prefix-map*) | 24 | - -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) |
24 | func_quote_for_eval "$arg" | 25 | + -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) |
25 | arg=$func_quote_for_eval_result | 26 | func_quote_arg pretty "$arg" |
27 | arg=$func_quote_arg_result | ||
26 | func_append compile_command " $arg" | 28 | func_append compile_command " $arg" |
diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch index 64f911d46c..c750303d43 100644 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch | |||
@@ -12,11 +12,10 @@ https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ | |||
12 | 12 | ||
13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00011.html] | 13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00011.html] |
14 | 14 | ||
15 | --- | 15 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
16 | Index: libtool-2.4.6/m4/libtool.m4 | 16 | index 022c1292..1a8a2998 100644 |
17 | =================================================================== | 17 | --- a/m4/libtool.m4 |
18 | --- libtool-2.4.6.orig/m4/libtool.m4 | 18 | +++ b/m4/libtool.m4 |
19 | +++ libtool-2.4.6/m4/libtool.m4 | ||
20 | @@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ | 19 | @@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ |
21 | cat <<_LT_EOF >> "$cfgfile" | 20 | cat <<_LT_EOF >> "$cfgfile" |
22 | #! $SHELL | 21 | #! $SHELL |
@@ -25,3 +24,6 @@ Index: libtool-2.4.6/m4/libtool.m4 | |||
25 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 24 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
26 | 25 | ||
27 | # Provide generalized library-building support services. | 26 | # Provide generalized library-building support services. |
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch b/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch deleted file mode 100644 index 447640cef6..0000000000 --- a/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | From 418129bc63afc312701e84cb8afa5ca413df1ab5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pavel Raiskup <praiskup@redhat.com> | ||
3 | Date: Fri, 17 Apr 2015 16:54:58 +0200 | ||
4 | Subject: ARFLAGS: use 'cr' instead of 'cru' by default | ||
5 | |||
6 | In some GNU/Linux distributions people started to compile 'ar' | ||
7 | binary with --enable-deterministic-archives (binutils project). | ||
8 | That, however, in combination with our previous long time working | ||
9 | default AR_FLAGS=cru causes warnings on such installations: | ||
10 | ar: `u' modifier ignored since `D' is the default (see `U') | ||
11 | |||
12 | The 'u' option (at least with GNU binutils) did small optimization | ||
13 | during repeated builds because it instructed 'ar' to not | ||
14 | open/close unchanged *.o files and to rather read their contents | ||
15 | from old archive file. However, its removal should not cause a | ||
16 | big performance hit for usual workflows. | ||
17 | |||
18 | Distributions started using --enable-deterministic-archives | ||
19 | knowing that it would disable the 'u', just to rather have a bit | ||
20 | more deterministic builds. | ||
21 | |||
22 | Also, to justify this change a bit more, keeping 'u' in ARFLAGS | ||
23 | could only result in many per-project changes to override | ||
24 | Libtool's ARFLAGS default, just to silent such warnings. | ||
25 | |||
26 | Fixes bug#19967. Reported by Eric Blake. | ||
27 | |||
28 | * m4/libtool.m4 (_LT_PROG_AR): Default AR_FLAGS to 'cr'. | ||
29 | (_LT_REQUIRED_DARWIN_CHECKS): Use $AR_FLAGS instead 'cru' string. | ||
30 | * doc/libtool.texi: Do 's/ar cru/ar cr/' in whole documentation. | ||
31 | * NEWS: Document. | ||
32 | |||
33 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=418129bc63afc312701e84cb8afa5ca413df1ab5] | ||
34 | |||
35 | Signed-off-by: Li Wang <li.wang@windriver.com> | ||
36 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
37 | --- | ||
38 | NEWS | 4 ++++ | ||
39 | doc/libtool.texi | 10 +++++----- | ||
40 | m4/libtool.m4 | 6 +++--- | ||
41 | 3 files changed, 12 insertions(+), 8 deletions(-) | ||
42 | |||
43 | diff --git a/NEWS b/NEWS | ||
44 | index 71a932d..1518f09 100644 | ||
45 | --- a/NEWS | ||
46 | +++ b/NEWS | ||
47 | @@ -13,6 +13,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool | ||
48 | variable, which obsoletes AR_FLAGS. This is due to naming conventions | ||
49 | among other *FLAGS and to be consistent with Automake's ARFLAGS. | ||
50 | |||
51 | +** Important incompatible changes: | ||
52 | + | ||
53 | + - Libtool changed ARFLAGS/AR_FLAGS default from 'cru' to 'cr'. | ||
54 | + | ||
55 | ** Bug fixes: | ||
56 | |||
57 | - Fix a race condition in ltdl dryrun test that would cause spurious | ||
58 | diff --git a/doc/libtool.texi b/doc/libtool.texi | ||
59 | index 0298627..4c664bb 100644 | ||
60 | --- a/doc/libtool.texi | ||
61 | +++ b/doc/libtool.texi | ||
62 | @@ -602,7 +602,7 @@ Without libtool, the programmer would invoke the @command{ar} command to | ||
63 | create a static library: | ||
64 | |||
65 | @example | ||
66 | -burger$ @kbd{ar cru libhello.a hello.o foo.o} | ||
67 | +burger$ @kbd{ar cr libhello.a hello.o foo.o} | ||
68 | burger$ | ||
69 | @end example | ||
70 | |||
71 | @@ -632,7 +632,7 @@ libtool are the same ones you would use to produce an executable named | ||
72 | a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.o hello.o} | ||
73 | *** Warning: Linking the shared library libhello.la against the | ||
74 | *** non-libtool objects foo.o hello.o is not portable! | ||
75 | -ar cru .libs/libhello.a | ||
76 | +ar cr .libs/libhello.a | ||
77 | ranlib .libs/libhello.a | ||
78 | creating libhello.la | ||
79 | (cd .libs && rm -f libhello.la && ln -s ../libhello.la libhello.la) | ||
80 | @@ -662,7 +662,7 @@ archive, not a shared library (@pxref{Static libraries}).}: | ||
81 | @example | ||
82 | a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \ | ||
83 | -rpath /usr/local/lib -lm} | ||
84 | -ar cru @value{objdir}/libhello.a foo.o hello.o | ||
85 | +ar cr @value{objdir}/libhello.a foo.o hello.o | ||
86 | ranlib @value{objdir}/libhello.a | ||
87 | creating libhello.la | ||
88 | (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la) | ||
89 | @@ -676,7 +676,7 @@ burger$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \ | ||
90 | -rpath /usr/local/lib -lm} | ||
91 | rm -fr @value{objdir}/libhello.a @value{objdir}/libhello.la | ||
92 | ld -Bshareable -o @value{objdir}/libhello.so.0.0 @value{objdir}/foo.o @value{objdir}/hello.o -lm | ||
93 | -ar cru @value{objdir}/libhello.a foo.o hello.o | ||
94 | +ar cr @value{objdir}/libhello.a foo.o hello.o | ||
95 | ranlib @value{objdir}/libhello.a | ||
96 | creating libhello.la | ||
97 | (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la) | ||
98 | @@ -6001,7 +6001,7 @@ in cases where it is necessary. | ||
99 | @subsection Archivers | ||
100 | |||
101 | On all known systems, building a static library can be accomplished by | ||
102 | -running @kbd{ar cru lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}}, | ||
103 | +running @kbd{ar cr lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}}, | ||
104 | where the @file{.a} file is the output library, and each @file{.o} file is an | ||
105 | object file. | ||
106 | |||
107 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
108 | index 6514196..add06ee 100644 | ||
109 | --- a/m4/libtool.m4 | ||
110 | +++ b/m4/libtool.m4 | ||
111 | @@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;} | ||
112 | _LT_EOF | ||
113 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
114 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
115 | - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
116 | - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
117 | + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
118 | + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
119 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
120 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
121 | cat > conftest.c << _LT_EOF | ||
122 | @@ -1505,7 +1505,7 @@ _LT_DECL([], [AR], [1], [The archiver]) | ||
123 | # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS | ||
124 | # variable obsoleted/removed. | ||
125 | |||
126 | -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru} | ||
127 | +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} | ||
128 | lt_ar_flags=$AR_FLAGS | ||
129 | _LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) | ||
130 | |||
131 | -- | ||
132 | 2.23.0 | ||
133 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/libool.m4-add-ARFLAGS-variable.patch b/meta/recipes-devtools/libtool/libtool/libool.m4-add-ARFLAGS-variable.patch deleted file mode 100644 index bb11887cda..0000000000 --- a/meta/recipes-devtools/libtool/libtool/libool.m4-add-ARFLAGS-variable.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | From 4335de1dfb7d2ec728427e07a54136b94a2d40f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pavel Raiskup <praiskup@redhat.com> | ||
3 | Date: Fri, 17 Apr 2015 15:05:42 +0200 | ||
4 | Subject: libool.m4: add ARFLAGS variable | ||
5 | |||
6 | Libtool has used $AR_FLAGS since 2000-05-29 commit | ||
7 | 8300de4c54e6f04f0d, Automake ARFLAGS since 2003-04-06 commit | ||
8 | a71b3490639831ca. Even though ARFLAGS is younger, it sounds like | ||
9 | better name according GNU Coding Standards. | ||
10 | |||
11 | Related to bug#20082. | ||
12 | |||
13 | * m4/libtool.m4 (_LT_PROG_AR): Copy ARFLAGS value into AR_FLAGS | ||
14 | variable if AR_FLAGS is not set. Add new _LT_DECL'ed variable | ||
15 | 'lt_ar_flags' to keep the configure-time value of AR_FLAGS. The | ||
16 | new 'lt_ar_flags' is to be used as the default value for AR_FLAGS | ||
17 | at libtool-runtime. | ||
18 | * NEWS: Document. | ||
19 | |||
20 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=4335de1dfb7d2ec728427e07a54136b94a2d40f6] | ||
21 | |||
22 | Signed-off-by: Li Wang <li.wang@windriver.com> | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
24 | --- | ||
25 | NEWS | 6 ++++++ | ||
26 | m4/libtool.m4 | 17 +++++++++++++++-- | ||
27 | 2 files changed, 21 insertions(+), 2 deletions(-) | ||
28 | |||
29 | diff --git a/NEWS b/NEWS | ||
30 | index d7ca434..71a932d 100644 | ||
31 | --- a/NEWS | ||
32 | +++ b/NEWS | ||
33 | @@ -7,6 +7,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool | ||
34 | - LT_SYS_LIBRARY_PATH can be set in config.site, or at configure time | ||
35 | and persists correctly in the generated libtool script. | ||
36 | |||
37 | +** New features: | ||
38 | + | ||
39 | + - Libtool script now supports (configure-time and runtime) ARFLAGS | ||
40 | + variable, which obsoletes AR_FLAGS. This is due to naming conventions | ||
41 | + among other *FLAGS and to be consistent with Automake's ARFLAGS. | ||
42 | + | ||
43 | ** Bug fixes: | ||
44 | |||
45 | - Fix a race condition in ltdl dryrun test that would cause spurious | ||
46 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
47 | index 63acd09..6514196 100644 | ||
48 | --- a/m4/libtool.m4 | ||
49 | +++ b/m4/libtool.m4 | ||
50 | @@ -1497,9 +1497,22 @@ need_locks=$enable_libtool_lock | ||
51 | m4_defun([_LT_PROG_AR], | ||
52 | [AC_CHECK_TOOLS(AR, [ar], false) | ||
53 | : ${AR=ar} | ||
54 | -: ${AR_FLAGS=cru} | ||
55 | _LT_DECL([], [AR], [1], [The archiver]) | ||
56 | -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
57 | + | ||
58 | +# Use ARFLAGS variable as AR's operation code to sync the variable naming with | ||
59 | +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have | ||
60 | +# higher priority because thats what people were doing historically (setting | ||
61 | +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS | ||
62 | +# variable obsoleted/removed. | ||
63 | + | ||
64 | +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru} | ||
65 | +lt_ar_flags=$AR_FLAGS | ||
66 | +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) | ||
67 | + | ||
68 | +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override | ||
69 | +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. | ||
70 | +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], | ||
71 | + [Flags to create an archive]) | ||
72 | |||
73 | AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
74 | [lt_cv_ar_at_file=no | ||
75 | -- | ||
76 | 2.23.0 | ||
77 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch b/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch deleted file mode 100644 index b633bc41bb..0000000000 --- a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | Cut and paste the pieces of build-aux/options-parser inline into the main | ||
2 | ltmain.sh code. This removes a performance degradation caused by the | ||
3 | repeated calls to func_quote_for_eval, the mechanism funclib uses | ||
4 | to construct the functions used for option parsing. | ||
5 | |||
6 | Upstream-Status: Submitted [Being discussed on mailing list Feb 2015] | ||
7 | |||
8 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
9 | index d5cf07a..0f54303 100644 | ||
10 | --- a/build-aux/ltmain.in | ||
11 | +++ b/build-aux/ltmain.in | ||
12 | @@ -342,11 +342,15 @@ _LT_EOF | ||
13 | # libtool_options_prep [ARG]... | ||
14 | # ----------------------------- | ||
15 | # Preparation for options parsed by libtool. | ||
16 | -libtool_options_prep () | ||
17 | -{ | ||
18 | +#libtool_options_prep () | ||
19 | +#{ | ||
20 | $debug_mode | ||
21 | |||
22 | # Option defaults: | ||
23 | + opt_verbose=false | ||
24 | + opt_warning_types= | ||
25 | + | ||
26 | + # Option defaults: | ||
27 | opt_config=false | ||
28 | opt_dlopen= | ||
29 | opt_dry_run=false | ||
30 | @@ -382,19 +386,14 @@ libtool_options_prep () | ||
31 | shift; set dummy --mode uninstall ${1+"$@"}; shift | ||
32 | ;; | ||
33 | esac | ||
34 | - | ||
35 | - # Pass back the list of options. | ||
36 | - func_quote_for_eval ${1+"$@"} | ||
37 | - libtool_options_prep_result=$func_quote_for_eval_result | ||
38 | -} | ||
39 | -func_add_hook func_options_prep libtool_options_prep | ||
40 | +#} | ||
41 | |||
42 | |||
43 | # libtool_parse_options [ARG]... | ||
44 | # --------------------------------- | ||
45 | # Provide handling for libtool specific options. | ||
46 | -libtool_parse_options () | ||
47 | -{ | ||
48 | +#libtool_parse_options () | ||
49 | +#{ | ||
50 | $debug_cmd | ||
51 | |||
52 | # Perform our own loop to consume as many options as possible in | ||
53 | @@ -474,29 +473,90 @@ libtool_parse_options () | ||
54 | func_append preserve_args " $_G_opt" | ||
55 | ;; | ||
56 | |||
57 | - # An option not handled by this hook function: | ||
58 | - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
59 | - esac | ||
60 | - done | ||
61 | + --debug|-x) debug_cmd='set -x' | ||
62 | + func_echo "enabling shell trace mode" | ||
63 | + $debug_cmd | ||
64 | + ;; | ||
65 | |||
66 | + --no-warnings|--no-warning|--no-warn) | ||
67 | + set dummy --warnings none ${1+"$@"} | ||
68 | + shift | ||
69 | + ;; | ||
70 | |||
71 | - # save modified positional parameters for caller | ||
72 | - func_quote_for_eval ${1+"$@"} | ||
73 | - libtool_parse_options_result=$func_quote_for_eval_result | ||
74 | -} | ||
75 | -func_add_hook func_parse_options libtool_parse_options | ||
76 | + --warnings|--warning|-W) | ||
77 | + test $# = 0 && func_missing_arg $_G_opt && break | ||
78 | + case " $warning_categories $1" in | ||
79 | + *" $1 "*) | ||
80 | + # trailing space prevents matching last $1 above | ||
81 | + func_append_uniq opt_warning_types " $1" | ||
82 | + ;; | ||
83 | + *all) | ||
84 | + opt_warning_types=$warning_categories | ||
85 | + ;; | ||
86 | + *none) | ||
87 | + opt_warning_types=none | ||
88 | + warning_func=: | ||
89 | + ;; | ||
90 | + *error) | ||
91 | + opt_warning_types=$warning_categories | ||
92 | + warning_func=func_fatal_error | ||
93 | + ;; | ||
94 | + *) | ||
95 | + func_fatal_error \ | ||
96 | + "unsupported warning category: '$1'" | ||
97 | + ;; | ||
98 | + esac | ||
99 | + shift | ||
100 | + ;; | ||
101 | + | ||
102 | + --verbose|-v) opt_verbose=: ;; | ||
103 | + --version) func_version ;; | ||
104 | + -\?|-h) func_usage ;; | ||
105 | + --help) func_help ;; | ||
106 | + | ||
107 | + # Separate optargs to long options (plugins may need this): | ||
108 | + --*=*) func_split_equals "$_G_opt" | ||
109 | + set dummy "$func_split_equals_lhs" \ | ||
110 | + "$func_split_equals_rhs" ${1+"$@"} | ||
111 | + shift | ||
112 | + ;; | ||
113 | + | ||
114 | + # Separate optargs to short options: | ||
115 | + -W*) | ||
116 | + func_split_short_opt "$_G_opt" | ||
117 | + set dummy "$func_split_short_opt_name" \ | ||
118 | + "$func_split_short_opt_arg" ${1+"$@"} | ||
119 | + shift | ||
120 | + ;; | ||
121 | + | ||
122 | + # Separate non-argument short options: | ||
123 | + -\?*|-h*|-v*|-x*) | ||
124 | + func_split_short_opt "$_G_opt" | ||
125 | + set dummy "$func_split_short_opt_name" \ | ||
126 | + "-$func_split_short_opt_arg" ${1+"$@"} | ||
127 | + shift | ||
128 | + ;; | ||
129 | + | ||
130 | + --) break ;; | ||
131 | + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; | ||
132 | + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
133 | + esac | ||
134 | + done | ||
135 | +#} | ||
136 | |||
137 | +# Display all warnings if -W was not given. | ||
138 | +test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" | ||
139 | |||
140 | |||
141 | # libtool_validate_options [ARG]... | ||
142 | # --------------------------------- | ||
143 | # Perform any sanity checks on option settings and/or unconsumed | ||
144 | # arguments. | ||
145 | -libtool_validate_options () | ||
146 | -{ | ||
147 | +#libtool_validate_options () | ||
148 | +#{ | ||
149 | # save first non-option argument | ||
150 | if test 0 -lt $#; then | ||
151 | - nonopt=$1 | ||
152 | + nonopt=$_G_opt | ||
153 | shift | ||
154 | fi | ||
155 | |||
156 | @@ -537,20 +597,10 @@ libtool_validate_options () | ||
157 | generic_help=$help | ||
158 | help="Try '$progname --help --mode=$opt_mode' for more information." | ||
159 | } | ||
160 | +#} | ||
161 | |||
162 | - # Pass back the unparsed argument list | ||
163 | - func_quote_for_eval ${1+"$@"} | ||
164 | - libtool_validate_options_result=$func_quote_for_eval_result | ||
165 | -} | ||
166 | -func_add_hook func_validate_options libtool_validate_options | ||
167 | - | ||
168 | - | ||
169 | -# Process options as early as possible so that --help and --version | ||
170 | -# can return quickly. | ||
171 | -func_options ${1+"$@"} | ||
172 | -eval set dummy "$func_options_result"; shift | ||
173 | - | ||
174 | - | ||
175 | +# Bail if the options were screwed! | ||
176 | +$exit_cmd $EXIT_FAILURE | ||
177 | |||
178 | ## ----------- ## | ||
179 | ## Main. ## | ||
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.7.bb index 44a4950574..44a4950574 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.7.bb | |||
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb index 86c55ded7b..86c55ded7b 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb | |||