diff options
Diffstat (limited to 'meta/recipes-devtools/libtool')
5 files changed, 97 insertions, 1 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc index 8e17b56d46..c8744e6d5f 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc | |||
@@ -21,6 +21,10 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ | |||
21 | file://unwind-opt-parsing.patch \ | 21 | file://unwind-opt-parsing.patch \ |
22 | file://0001-libtool-Fix-support-for-NIOS2-processor.patch \ | 22 | file://0001-libtool-Fix-support-for-NIOS2-processor.patch \ |
23 | file://0001-libtool-Check-for-static-libs-for-internal-compiler-.patch \ | 23 | file://0001-libtool-Check-for-static-libs-for-internal-compiler-.patch \ |
24 | file://0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ | ||
25 | file://0001-Makefile.am-make-sure-autoheader-run-before-automake.patch \ | ||
26 | file://lto-prefix.patch \ | ||
27 | file://debian-no_hostname.patch \ | ||
24 | " | 28 | " |
25 | 29 | ||
26 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" | 30 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" |
diff --git a/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch new file mode 100644 index 0000000000..2e9908725e --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From dfbbbd359e43e0a55fbea06f2647279ad8761cb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 24 Mar 2021 03:04:13 +0000 | ||
4 | Subject: [PATCH] Makefile.am: make sure autoheader run before autoconf | ||
5 | |||
6 | autoheader will update ../libtool-2.4.6/libltdl/config-h.in which | ||
7 | autoconf needs, so there comes a race sometimes as below: | ||
8 | | configure.ac:45: error: required file 'config-h.in' not found | ||
9 | | touch '../libtool-2.4.6/libltdl/config-h.in' | ||
10 | |||
11 | So make sure autoheader run before autoconf to avoid this race. | ||
12 | |||
13 | Upstream-Status: Submitted [libtool-patches@gnu.org maillist] | ||
14 | |||
15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
16 | --- | ||
17 | Makefile.am | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | ||
21 | index 4142c90..fe1a9fc 100644 | ||
22 | --- a/Makefile.am | ||
23 | +++ b/Makefile.am | ||
24 | @@ -365,7 +365,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) | ||
25 | $(lt_aclocal_m4): $(lt_aclocal_m4_deps) | ||
26 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 | ||
27 | |||
28 | -$(lt_configure): $(lt_configure_deps) | ||
29 | +$(lt_configure): $(lt_configure_deps) $(lt_config_h_in) | ||
30 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF) | ||
31 | |||
32 | $(lt_config_h_in): $(lt_configure_deps) | ||
33 | -- | ||
34 | 2.29.2 | ||
35 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch new file mode 100644 index 0000000000..87f8492346 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From e82c06584f02e3e4487aa73aa05981e2a35dc6d1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Tue, 13 Apr 2021 07:17:29 +0000 | ||
4 | Subject: [PATCH] Makefile.am: make sure autoheader run before automake | ||
5 | |||
6 | When use automake to generate Makefile.in from Makefile.am, there | ||
7 | comes below race: | ||
8 | | configure.ac:45: error: required file 'config-h.in' not found | ||
9 | |||
10 | It is because the file config-h.in in updating process by autoheader, | ||
11 | so make automake run after autoheader to avoid the above race. | ||
12 | |||
13 | Upstream-Status: Submitted [libtool-patches@gnu.org maillist] | ||
14 | |||
15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
16 | --- | ||
17 | Makefile.am | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | ||
21 | index 2752ecc..29950db 100644 | ||
22 | --- a/Makefile.am | ||
23 | +++ b/Makefile.am | ||
24 | @@ -328,7 +328,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ | ||
25 | $(lt_obsolete_m4) \ | ||
26 | $(stamp_mk) | ||
27 | |||
28 | -$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) | ||
29 | +$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in) | ||
30 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile | ||
31 | |||
32 | # Don't let unused scripts leak into the libltdl Makefile | ||
33 | -- | ||
34 | 2.29.2 | ||
35 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/lto-prefix.patch b/meta/recipes-devtools/libtool/libtool/lto-prefix.patch new file mode 100644 index 0000000000..2bd010b8e4 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/lto-prefix.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | If lto is enabled, we need the prefix-map variables to be passed to the linker. | ||
2 | Add these to the list of options libtool passes through. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
6 | |||
7 | Index: libtool-2.4.6/build-aux/ltmain.in | ||
8 | =================================================================== | ||
9 | --- libtool-2.4.6.orig/build-aux/ltmain.in | ||
10 | +++ libtool-2.4.6/build-aux/ltmain.in | ||
11 | @@ -5424,9 +5424,10 @@ func_mode_link () | ||
12 | # --sysroot=* for sysroot support | ||
13 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | ||
14 | # -stdlib=* select c++ std lib with clang | ||
15 | + # -f*-prefix-map* needed for lto linking | ||
16 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | ||
17 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | ||
18 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) | ||
19 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-f*-prefix-map*) | ||
20 | func_quote_for_eval "$arg" | ||
21 | arg=$func_quote_for_eval_result | ||
22 | func_append compile_command " $arg" | ||
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb index a5715faaa9..f5fdd00e5e 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require libtool-${PV}.inc | 1 | require libtool-${PV}.inc |
2 | 2 | ||
3 | SRC_URI += "file://multilib.patch file://debian-no_hostname.patch" | 3 | SRC_URI += "file://multilib.patch" |
4 | 4 | ||
5 | RDEPENDS_${PN} += "bash" | 5 | RDEPENDS_${PN} += "bash" |
6 | 6 | ||