summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.5.2.inc (renamed from meta/recipes-devtools/libtool/libtool-2.4.7.inc)22
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb)7
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.7.bb20
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.5.2.bb11
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch13
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch33
-rw-r--r--meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch170
-rw-r--r--meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch37
-rw-r--r--meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch28
-rw-r--r--meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch17
-rw-r--r--meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch17
-rw-r--r--meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch16
-rw-r--r--meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch60
-rw-r--r--meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch17
-rw-r--r--meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch31
-rw-r--r--meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch33
-rw-r--r--meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch37
-rw-r--r--meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch29
-rw-r--r--meta/recipes-devtools/libtool/libtool/fixinstall.patch35
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.5.2.bb21
-rw-r--r--meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb (renamed from meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb)8
-rw-r--r--meta/recipes-devtools/libtool/remove-buildpaths.inc (renamed from meta/recipes-devtools/libtool/libtool_2.4.7.bb)21
22 files changed, 92 insertions, 591 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.5.2.inc
index 16bb10d48f..bde80e12ce 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.5.2.inc
@@ -8,33 +8,17 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " 9 file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c "
10 10
11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 11SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \
12 file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ 12 file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \
13 file://0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch \
14 file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \
15 file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ 13 file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
16 file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ 14 file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
17 file://dont-depend-on-help2man.patch \ 15 file://dont-depend-on-help2man.patch \
18 file://0003-libtool.m4-Cleanup-sysroot-trailing.patch \
19 file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ 16 file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \
20 file://nohardcodepaths.patch \
21 file://0007-libtool-Fix-support-for-NIOS2-processor.patch \
22 file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ 17 file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \
23 file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ 18 file://nohardcodepaths.patch \
24 file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \
25 file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \
26 file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \
27 file://0001-ltmain.in-Parse-additional-clang-options.patch \
28 " 19 "
29 20
30SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" 21SRC_URI[sha256sum] = "29275fb45b236d6ff720a433f9cd5f61ea2f52cc3aa2e5f89ba57726bda54793"
31
32do_compile:prepend () {
33 # Sometimes this file doesn't get rebuilt, force the issue
34 rm -f ${S}/build-aux/ltmain.sh
35 make build-aux/ltmain.sh
36 ./config.status
37}
38 22
39inherit autotools texinfo 23inherit autotools texinfo
40EXTRA_AUTORECONF = "--exclude=libtoolize" 24EXTRA_AUTORECONF = "--exclude=libtoolize"
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb
index 93f1dd7825..18849cb8ef 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb
@@ -7,13 +7,6 @@ datadir = "${STAGING_DIR_TARGET}${target_datadir}"
7 7
8inherit nopackages 8inherit nopackages
9 9
10do_configure:prepend () {
11 # Remove any existing libtool m4 since old stale versions would break
12 # any upgrade
13 rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
14 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
15}
16
17# 10#
18# ccache may or may not be INHERITED, we remove references to it so the sstate 11# ccache may or may not be INHERITED, we remove references to it so the sstate
19# artefact works on a machine where its not present. libtool-cross isn't used 12# artefact works on a machine where its not present. libtool-cross isn't used
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb
deleted file mode 100644
index 19024f7830..0000000000
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require libtool-${PV}.inc
2
3DEPENDS = ""
4
5inherit native
6
7EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
8
9do_configure:prepend () {
10 # Remove any existing libtool m4 since old stale versions would break
11 # any upgrade
12 rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
13 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
14}
15
16do_install () {
17 autotools_do_install
18 install -d ${D}${bindir}/
19 install -m 0755 libtool ${D}${bindir}/libtool
20}
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb
new file mode 100644
index 0000000000..be96b52dd6
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb
@@ -0,0 +1,11 @@
1require libtool-${PV}.inc
2
3DEPENDS = ""
4
5inherit native
6
7do_install () {
8 autotools_do_install
9 install -d ${D}${bindir}/
10 install -m 0755 libtool ${D}${bindir}/libtool
11}
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 51c0c52da8..d5d906e6b6 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
@@ -14,11 +14,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14 14
15Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] 15Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html]
16 16
17diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in 17Index: libtool-2.5.0/build-aux/ltmain.in
18index a5f21a1..f884824 100644 18===================================================================
19--- a/build-aux/ltmain.in 19--- libtool-2.5.0.orig/build-aux/ltmain.in
20+++ b/build-aux/ltmain.in 20+++ libtool-2.5.0/build-aux/ltmain.in
21@@ -2381,8 +2381,14 @@ func_mode_install () 21@@ -2382,8 +2382,14 @@ func_mode_install ()
22 func_append dir "$objdir" 22 func_append dir "$objdir"
23 23
24 if test -n "$relink_command"; then 24 if test -n "$relink_command"; then
@@ -34,6 +34,3 @@ index a5f21a1..f884824 100644
34 34
35 # 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
36 # location b/c this prevents finding dependent libraries that 36 # location b/c this prevents finding dependent libraries that
37--
382.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
deleted file mode 100644
index c52083327c..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1ltmain.in: Parse additional clang options
2
3clang uses -rtlib and --unwindlib to select proper compiler
4runtime in some cases. Therefore pass these options to linker when found in
5ldflags
6
7* build-aux/ltmain.in: Handle clang linker options
8
9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=725646bf095bf5c07c49ae38dd060f95bd95ae3c]
11
12---
13 build-aux/ltmain.in | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
17index 037f009..ba5c816 100644
18--- a/build-aux/ltmain.in
19+++ b/build-aux/ltmain.in
20@@ -5414,10 +5414,12 @@ func_mode_link ()
21 # -fsanitize=* Clang/GCC memory and address sanitizer
22 # -fuse-ld=* Linker select flags for GCC
23 # -f{file|debug|macro|profile}-prefix-map* needed for lto linking
24+ # -rtlib=* select c runtime lib with clang
25+ # --unwindlib=* select unwinder library with clang
26 # -Wa,* Pass flags directly to the assembler
27 -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=*| \
29- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
30+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \
31 -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*)
32 func_quote_arg pretty "$arg"
33 arg=$func_quote_arg_result
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
deleted file mode 100644
index 2126f82953..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
1From: Khem Raj <raj.khem@gmail.com>
2Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils
3
4This patch renames the --with-sysroot option to --with-libtool-sysroot
5to avoid namespace conflict with binutils, gcc and other toolchain
6components since these componets also add that option to configure
7and this becomes confusing and conflicting otherwise.
8
9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10
11Upstream report:
12http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
13
14Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html]
15
16Index: libtool-2.4.7/m4/libtool.m4
17===================================================================
18--- libtool-2.4.7.orig/m4/libtool.m4
19+++ libtool-2.4.7/m4/libtool.m4
20@@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr
21 AC_DEFUN([_LT_WITH_SYSROOT],
22 [m4_require([_LT_DECL_SED])dnl
23 AC_MSG_CHECKING([for sysroot])
24-AC_ARG_WITH([sysroot],
25-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
26+AC_ARG_WITH([libtool-sysroot],
27+[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@],
28 [Search for dependent libraries within DIR (or the compiler's sysroot
29 if not specified).])],
30-[], [with_sysroot=no])
31+[], [with_libtool_sysroot=no])
32
33 dnl lt_sysroot will always be passed unquoted. We quote it here
34 dnl in case the user passed a directory name.
35 lt_sysroot=
36-case $with_sysroot in #(
37+case $with_libtool_sysroot in #(
38 yes)
39 if test yes = "$GCC"; then
40 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
41 fi
42 ;; #(
43 /*)
44- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
45+ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"`
46 ;; #(
47 no|'')
48 ;; #(
49 *)
50- AC_MSG_RESULT([$with_sysroot])
51+ AC_MSG_RESULT([$with_libtool_sysroot])
52 AC_MSG_ERROR([The sysroot must be an absolute path.])
53 ;;
54 esac
55Index: libtool-2.4.7/tests/sysroot.at
56===================================================================
57--- libtool-2.4.7.orig/tests/sysroot.at
58+++ libtool-2.4.7/tests/sysroot.at
59@@ -65,7 +65,7 @@ while read file; do
60 done])
61
62 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
63-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
64+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
65
66 #???
67 if test PATH = "$shlibpath_var"; then
68@@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign])
69 AC_PROG_CC
70 AC_CONFIG_SRCDIR([lib2.c])
71 LT_INIT
72-sysroot=$with_sysroot
73+sysroot=$with_libtool_sysroot
74 AC_SUBST([sysroot])
75 AC_OUTPUT(Makefile)
76 ]])
77@@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign])
78 AC_PROG_CC
79 AC_CONFIG_SRCDIR([prog.c])
80 LT_INIT
81-sysroot=$with_sysroot
82+sysroot=$with_libtool_sysroot
83 AC_SUBST([sysroot])
84 AC_OUTPUT(Makefile)
85 ]])
86diff --git a/tests/testsuite b/tests/testsuite
87index 24265e4..d388e3e 100755
88--- a/tests/testsuite
89+++ b/tests/testsuite
90@@ -48997,7 +48997,7 @@ $at_traceon; }
91
92
93 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
94-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
95+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
96
97 #???
98 if test PATH = "$shlibpath_var"; then
99@@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign])
100 AC_PROG_CC
101 AC_CONFIG_SRCDIR([lib2.c])
102 LT_INIT
103-sysroot=$with_sysroot
104+sysroot=$with_libtool_sysroot
105 AC_SUBST([sysroot])
106 AC_OUTPUT(Makefile)
107 _ATEOF
108@@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign])
109 AC_PROG_CC
110 AC_CONFIG_SRCDIR([prog.c])
111 LT_INIT
112-sysroot=$with_sysroot
113+sysroot=$with_libtool_sysroot
114 AC_SUBST([sysroot])
115 AC_OUTPUT(Makefile)
116 _ATEOF
117@@ -49761,7 +49761,7 @@ $at_traceon; }
118
119
120 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
121-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
122+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
123
124 #???
125 if test PATH = "$shlibpath_var"; then
126@@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign])
127 AC_PROG_CC
128 AC_CONFIG_SRCDIR([lib2.c])
129 LT_INIT
130-sysroot=$with_sysroot
131+sysroot=$with_libtool_sysroot
132 AC_SUBST([sysroot])
133 AC_OUTPUT(Makefile)
134 _ATEOF
135@@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign])
136 AC_PROG_CC
137 AC_CONFIG_SRCDIR([prog.c])
138 LT_INIT
139-sysroot=$with_sysroot
140+sysroot=$with_libtool_sysroot
141 AC_SUBST([sysroot])
142 AC_OUTPUT(Makefile)
143 _ATEOF
144@@ -50525,7 +50525,7 @@ $at_traceon; }
145
146
147 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
148-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
149+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
150
151 #???
152 if test PATH = "$shlibpath_var"; then
153@@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign])
154 AC_PROG_CC
155 AC_CONFIG_SRCDIR([lib2.c])
156 LT_INIT
157-sysroot=$with_sysroot
158+sysroot=$with_libtool_sysroot
159 AC_SUBST([sysroot])
160 AC_OUTPUT(Makefile)
161 _ATEOF
162@@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign])
163 AC_PROG_CC
164 AC_CONFIG_SRCDIR([prog.c])
165 LT_INIT
166-sysroot=$with_sysroot
167+sysroot=$with_libtool_sysroot
168 AC_SUBST([sysroot])
169 AC_OUTPUT(Makefile)
170 _ATEOF
diff --git a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch
deleted file mode 100644
index 6d922382ef..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1libtool.m4: Cleanup sysroot trailing "/"
2
3If $CC has --sysroot=/, it is a valid configuration however libtool will
4then set lt_sysroot to "/".
5
6This means references like $lt_sysroot$libdir become //usr/lib instead
7of the more normally expected /usr/lib. This may or may not break something
8but certainly is confusing to the user and gives confusing output. Making
9"/" simply unset lt_sysroot is much cleaner.
10
11Whilst here, trim any trailing '/' from sysroot paths to drop the duplication
12and result in cleaner/consistent output.
13
14* m4/libtool.m4: Cleanup sysroot trailing '/' handling
15
16Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=365805327c7b9bbdb0e622b954b6b0d8eaeb3f99]
17Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
18
19---
20 m4/libtool.m4 | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/m4/libtool.m4 b/m4/libtool.m4
24index fa1ae91..2f31d24 100644
25--- a/m4/libtool.m4
26+++ b/m4/libtool.m4
27@@ -1256,7 +1256,9 @@ lt_sysroot=
28 case $with_libtool_sysroot in #(
29 yes)
30 if test yes = "$GCC"; then
31- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
32+ # Trim trailing / since we'll always append absolute paths and we want
33+ # to avoid //, if only for less confusing output for the user.
34+ lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
35 fi
36 ;; #(
37 /*)
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
deleted file mode 100644
index 35f48ef906..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From: Khem Raj <raj.khem@gmail.com>
2Subject: [PATCH 03/12] ltmain.in: Add missing sysroot to library path
3
4When using a sysroot we should append it to libdir, which is helpful in
5cross builds as the system is staged in the sysroot. For normal builds,
6i.e. when lt_sysroot is not set, it will still behave the same and add
7-L/usr/lib to the relink command.
8
9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10
11Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html]
12
13diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
14index f884824..25a91de 100644
15--- a/build-aux/ltmain.in
16+++ b/build-aux/ltmain.in
17@@ -6503,7 +6503,7 @@ func_mode_link ()
18 fi
19 else
20 # We cannot seem to hardcode it, guess we'll fake it.
21- add_dir=-L$libdir
22+ add_dir="-L$lt_sysroot$libdir"
23 # Try looking first in the location we're being installed to.
24 if test -n "$inst_prefix_dir"; then
25 case $libdir in
26--
272.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 9203302182..a6b3313d71 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
@@ -9,11 +9,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 9
10Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] 10Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html]
11 11
12diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in 12Index: libtool-2.5.0/build-aux/ltmain.in
13index 25a91de..40cb94a 100644 13===================================================================
14--- a/build-aux/ltmain.in 14--- libtool-2.5.0.orig/build-aux/ltmain.in
15+++ b/build-aux/ltmain.in 15+++ libtool-2.5.0/build-aux/ltmain.in
16@@ -7682,9 +7682,11 @@ EOF 16@@ -7584,9 +7584,11 @@ func_mode_link ()
17 test relink = "$opt_mode" || rpath=$compile_rpath$rpath 17 test relink = "$opt_mode" || rpath=$compile_rpath$rpath
18 for libdir in $rpath; do 18 for libdir in $rpath; do
19 if test -n "$hardcode_libdir_flag_spec"; then 19 if test -n "$hardcode_libdir_flag_spec"; then
@@ -27,7 +27,7 @@ index 25a91de..40cb94a 100644
27 if test -z "$hardcode_libdirs"; then 27 if test -z "$hardcode_libdirs"; then
28 hardcode_libdirs=$libdir 28 hardcode_libdirs=$libdir
29 else 29 else
30@@ -8414,6 +8416,10 @@ EOF 30@@ -8316,6 +8318,10 @@ func_mode_link ()
31 hardcode_libdirs= 31 hardcode_libdirs=
32 for libdir in $compile_rpath $finalize_rpath; do 32 for libdir in $compile_rpath $finalize_rpath; do
33 if test -n "$hardcode_libdir_flag_spec"; then 33 if test -n "$hardcode_libdir_flag_spec"; then
@@ -38,7 +38,7 @@ index 25a91de..40cb94a 100644
38 if test -n "$hardcode_libdir_separator"; then 38 if test -n "$hardcode_libdir_separator"; then
39 if test -z "$hardcode_libdirs"; then 39 if test -z "$hardcode_libdirs"; then
40 hardcode_libdirs=$libdir 40 hardcode_libdirs=$libdir
41@@ -8465,6 +8471,10 @@ EOF 41@@ -8367,6 +8373,10 @@ func_mode_link ()
42 hardcode_libdirs= 42 hardcode_libdirs=
43 for libdir in $finalize_rpath; do 43 for libdir in $finalize_rpath; do
44 if test -n "$hardcode_libdir_flag_spec"; then 44 if test -n "$hardcode_libdir_flag_spec"; then
@@ -49,6 +49,3 @@ index 25a91de..40cb94a 100644
49 if test -n "$hardcode_libdir_separator"; then 49 if test -n "$hardcode_libdir_separator"; then
50 if test -z "$hardcode_libdirs"; then 50 if test -z "$hardcode_libdirs"; then
51 hardcode_libdirs=$libdir 51 hardcode_libdirs=$libdir
52--
532.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 8b6352b01b..54e602f118 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,11 +12,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12 12
13Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] 13Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html]
14 14
15diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in 15Index: libtool-2.5.0/build-aux/ltmain.in
16index 40cb94a..2fa055e 100644 16===================================================================
17--- a/build-aux/ltmain.in 17--- libtool-2.5.0.orig/build-aux/ltmain.in
18+++ b/build-aux/ltmain.in 18+++ libtool-2.5.0/build-aux/ltmain.in
19@@ -7700,8 +7700,16 @@ EOF 19@@ -7602,8 +7602,16 @@ func_mode_link ()
20 esac 20 esac
21 fi 21 fi
22 else 22 else
@@ -35,7 +35,7 @@ index 40cb94a..2fa055e 100644
35 fi 35 fi
36 elif test -n "$runpath_var"; then 36 elif test -n "$runpath_var"; then
37 case "$perm_rpath " in 37 case "$perm_rpath " in
38@@ -8434,8 +8442,16 @@ EOF 38@@ -8336,8 +8344,16 @@ func_mode_link ()
39 esac 39 esac
40 fi 40 fi
41 else 41 else
@@ -54,7 +54,7 @@ index 40cb94a..2fa055e 100644
54 fi 54 fi
55 elif test -n "$runpath_var"; then 55 elif test -n "$runpath_var"; then
56 case "$perm_rpath " in 56 case "$perm_rpath " in
57@@ -8489,8 +8505,14 @@ EOF 57@@ -8391,8 +8407,14 @@ func_mode_link ()
58 esac 58 esac
59 fi 59 fi
60 else 60 else
@@ -71,6 +71,3 @@ index 40cb94a..2fa055e 100644
71 fi 71 fi
72 elif test -n "$runpath_var"; then 72 elif test -n "$runpath_var"; then
73 case "$finalize_perm_rpath " in 73 case "$finalize_perm_rpath " in
74--
752.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 c104e904cc..feb1048b55 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
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of d
10 m4/libtool.m4 | 6 +++--- 10 m4/libtool.m4 | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-) 11 1 file changed, 3 insertions(+), 3 deletions(-)
12 12
13diff --git a/m4/libtool.m4 b/m4/libtool.m4 13Index: libtool-2.5.0/m4/libtool.m4
14index 2f31d24..bd90775 100644 14===================================================================
15--- a/m4/libtool.m4 15--- libtool-2.5.0.orig/m4/libtool.m4
16+++ b/m4/libtool.m4 16+++ libtool-2.5.0/m4/libtool.m4
17@@ -1254,18 +1254,18 @@ dnl lt_sysroot will always be passed unquoted. We quote it here 17@@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq
18 dnl in case the user passed a directory name. 18 dnl in case the user passed a directory name.
19 lt_sysroot= 19 lt_sysroot=
20 case $with_libtool_sysroot in #( 20 case $with_sysroot in #(
21- yes) 21- yes)
22+ no) 22+ no)
23 if test yes = "$GCC"; then 23 if test yes = "$GCC"; then
@@ -29,10 +29,10 @@ index 2f31d24..bd90775 100644
29+ yes|''|/) 29+ yes|''|/)
30+ ;; #( 30+ ;; #(
31 /*) 31 /*)
32 lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` 32 lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
33 ;; #( 33 ;; #(
34- no|'') 34- no|'')
35- ;; #( 35- ;; #(
36 *) 36 *)
37 AC_MSG_RESULT([$with_libtool_sysroot]) 37 AC_MSG_RESULT([$with_sysroot])
38 AC_MSG_ERROR([The sysroot must be an absolute path.]) 38 AC_MSG_ERROR([The sysroot must be an absolute path.])
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
deleted file mode 100644
index 676ce7fd1b..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1libtool: Fix support for NIOS2 processor
2
3The name of the system contains the string "nios2". This string
4is caught by the some of the greedy checks for OS/2 in libtool,
5in particular the *os2* branches of switch statements match for
6the nios2 string, which results in incorrect behavior of libtool.
7
8Switch to use $host_os instead of $host and tweak the patterns to
9match to avoid this problem for nios2.
10
11* build-aux/ltmain.in: Fix NIOS2 support
12---
13 build-aux/ltmain.in | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
17
18Submitted: https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html
19Reworked and submitted: https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00068.html
20Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=49e6cb0d4dfdca2a59b909dc4532fe22dbc57ad5]
21
22Index: libtool-2.4.7/build-aux/ltmain.in
23===================================================================
24--- libtool-2.4.7.orig/build-aux/ltmain.in
25+++ libtool-2.4.7/build-aux/ltmain.in
26@@ -518,10 +518,10 @@ libtool_validate_options ()
27 # preserve --debug
28 test : = "$debug_cmd" || func_append preserve_args " --debug"
29
30- case $host in
31+ case $host_os in
32 # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
33 # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
34- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
35+ cygwin* | mingw* | pw32* | cegcc* | solaris2* | os2*)
36 # don't eliminate duplications in $postdeps and $predeps
37 opt_duplicate_compiler_generated_deps=:
38 ;;
39@@ -6273,8 +6273,8 @@ func_mode_link ()
40 fi
41 if test -n "$library_names" &&
42 { test no = "$use_static_libs" || test -z "$old_library"; }; then
43- case $host in
44- *cygwin* | *mingw* | *cegcc* | *os2*)
45+ case $host_os in
46+ cygwin* | mingw* | cegcc* | os2*)
47 # No point in relinking DLLs because paths are not encoded
48 func_append notinst_deplibs " $lib"
49 need_relink=no
50@@ -6343,8 +6343,8 @@ func_mode_link ()
51 soname=$dlname
52 elif test -n "$soname_spec"; then
53 # bleh windows
54- case $host in
55- *cygwin* | mingw* | *cegcc* | *os2*)
56+ case $host_os in
57+ cygwin* | mingw* | cegcc* | os2*)
58 func_arith $current - $age
59 major=$func_arith_result
60 versuffix=-$major
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 c151c3b481..c103ebb7bf 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
@@ -15,19 +15,16 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
15 15
16Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] 16Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html]
17 17
18diff --git a/m4/libtool.m4 b/m4/libtool.m4 18Index: libtool-2.5.0/m4/libtool.m4
19index bd90775..3794130 100644 19===================================================================
20--- a/m4/libtool.m4 20--- libtool-2.5.0.orig/m4/libtool.m4
21+++ b/m4/libtool.m4 21+++ libtool-2.5.0/m4/libtool.m4
22@@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then 22@@ -7553,7 +7553,7 @@ if AC_TRY_EVAL(ac_compile); then
23 for p in `eval "$output_verbose_link_cmd"`; do 23 for p in `eval "$output_verbose_link_cmd"`; do
24 case $prev$p in 24 case $prev$p in
25 25
26- -L* | -R* | -l*) 26- -L* | -R* | -l*)
27+ -L* | -R* | -l* | */libclang_rt.*.a) 27+ -L* | -R* | -l* | */libclang_rt.*.a)
28 # Some compilers place space between "-{L,R}" and the path. 28 # Some compilers place space between "-{L,R,l}" and the path.
29 # Remove the space. 29 # Remove the space.
30 if test x-L = "$p" || 30 if test x-L = x"$p" ||
31--
322.25.1
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
deleted file mode 100644
index f51deecbef..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From: Mingli Yu <mingli.yu@windriver.com>
2Subject: [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf
3
4autoheader will update ../libtool-2.4.6/libltdl/config-h.in which
5autoconf needs, so there comes a race sometimes as below:
6 | configure.ac:45: error: required file 'config-h.in' not found
7 | touch '../libtool-2.4.6/libltdl/config-h.in'
8
9So make sure autoheader run before autoconf to avoid this race.
10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13
14Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a]
15
16diff --git a/Makefile.am b/Makefile.am
17index c29860e..9c34bfd 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
21 $(lt_aclocal_m4): $(lt_aclocal_m4_deps)
22 $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4
23
24-$(lt_configure): $(lt_configure_deps)
25+$(lt_configure): $(lt_configure_deps) $(lt_config_h_in)
26 $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF)
27
28 $(lt_config_h_in): $(lt_configure_deps)
29--
302.25.1
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
deleted file mode 100644
index e451de59e3..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From: Mingli Yu <mingli.yu@windriver.com>
2Subject: [PATCH 10/12] Makefile.am: make sure autoheader run before automake
3
4When use automake to generate Makefile.in from Makefile.am, there
5comes below race:
6 | configure.ac:45: error: required file 'config-h.in' not found
7
8It is because the file config-h.in in updating process by autoheader,
9so make automake run after autoheader to avoid the above race.
10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13
14Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e01c0bfe5e041418d84460901a1a5b11b89d596f]
15
16Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
17
18diff --git a/Makefile.am b/Makefile.am
19index 9c34bfd..231ef3f 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \
23 $(lt_obsolete_m4) \
24 $(stamp_mk)
25
26-$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
27+$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in)
28 $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile
29
30 # Don't let unused scripts leak into the libltdl Makefile
31--
322.25.1
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
deleted file mode 100644
index 4c6b6f05b4..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1ltmain.in: Handle prefix-map compiler options correctly
2
3If lto is enabled, we need the prefix-map variables to be passed to the linker
4to correctly link the objects using correctly mapped paths.
5
6Add these to the list of options libtool passes through.
7
8* build-aux/ltmain.in: Handle prefix-map compiler options
9
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html
13https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00066.html
14Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=cdf4bf702f11d17e06569936e8a433a77f791228]
15
16---
17 build-aux/ltmain.in | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
21index 0a50f5b..037f009 100644
22--- a/build-aux/ltmain.in
23+++ b/build-aux/ltmain.in
24@@ -5413,11 +5413,12 @@ func_mode_link ()
25 # -stdlib=* select c++ std lib with clang
26 # -fsanitize=* Clang/GCC memory and address sanitizer
27 # -fuse-ld=* Linker select flags for GCC
28+ # -f{file|debug|macro|profile}-prefix-map* needed for lto linking
29 # -Wa,* Pass flags directly to the assembler
30 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
31 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
32 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
33- -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
34+ -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*)
35 func_quote_arg pretty "$arg"
36 arg=$func_quote_arg_result
37 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
deleted file mode 100644
index 8469b8727e..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From: Richard Purdie <richard.purdie@linuxfoundation.org>
2Subject: [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script
3
4For reproducibilty, stop encoding the hostname into the libtool script, this isn't
5really adding much to debugging and most distros are carrying such a patch now as
6reproducibility is important.
7
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9
10https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/
11 no_hostname.patch
12
13Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89]
14
15diff --git a/m4/libtool.m4 b/m4/libtool.m4
16index 3794130..84a550c 100644
17--- a/m4/libtool.m4
18+++ b/m4/libtool.m4
19@@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([
20 cat <<_LT_EOF >> "$cfgfile"
21 #! $SHELL
22 # Generated automatically by $as_me ($PACKAGE) $VERSION
23-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
24 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
25
26 # Provide generalized library-building support services.
27--
282.25.1
29
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
index 48330d82fb..94601b1beb 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
@@ -18,10 +18,11 @@ RP 2011/11/16
18 18
19Updated by: Robert Yang <liezhi.yang@windriver.com> 19Updated by: Robert Yang <liezhi.yang@windriver.com>
20 20
21diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in 21Index: libtool-2.5.2/build-aux/ltmain.in
22--- a/build-aux/ltmain.in 22===================================================================
23+++ b/build-aux/ltmain.in 23--- libtool-2.5.2.orig/build-aux/ltmain.in
24@@ -2355,7 +2355,7 @@ func_mode_install () 24+++ libtool-2.5.2/build-aux/ltmain.in
25@@ -2381,7 +2381,7 @@ func_mode_install ()
25 dir=$func_dirname_result 26 dir=$func_dirname_result
26 func_append dir "$objdir" 27 func_append dir "$objdir"
27 28
@@ -29,8 +30,8 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
29+ if test "$fast_install" = no && test -n "$relink_command"; then 30+ if test "$fast_install" = no && test -n "$relink_command"; then
30 # Strip any trailing slash from the destination. 31 # Strip any trailing slash from the destination.
31 func_stripname '' '/' "$libdir" 32 func_stripname '' '/' "$libdir"
32 destlibdir=$func_stripname_result 33 destlibdir=$func_stripname_result
33@@ -2394,7 +2394,7 @@ func_mode_install () 34@@ -2419,7 +2419,7 @@ func_mode_install ()
34 shift 35 shift
35 36
36 srcname=$realname 37 srcname=$realname
@@ -39,7 +40,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
39 40
40 # Install the shared library and build the symlinks. 41 # Install the shared library and build the symlinks.
41 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 42 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
42@@ -6162,15 +6162,15 @@ func_mode_link () 43@@ -6276,17 +6276,17 @@ func_mode_link ()
43 # Hardcode the library path. 44 # Hardcode the library path.
44 # Skip directories that are in the system default run-time 45 # Skip directories that are in the system default run-time
45 # search path. 46 # search path.
@@ -48,7 +49,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
48- *) 49- *)
49- case "$compile_rpath " in 50- case "$compile_rpath " in
50- *" $absdir "*) ;; 51- *" $absdir "*) ;;
51- *) func_append compile_rpath " $absdir" ;; 52- *) case $absdir in
53- "$progdir/"*) func_append compile_rpath " $absdir" ;;
54- esac
52- esac 55- esac
53- ;; 56- ;;
54- esac 57- esac
@@ -57,14 +60,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
57+ #*) 60+ #*)
58+ # case "$compile_rpath " in 61+ # case "$compile_rpath " in
59+ # *" $absdir "*) ;; 62+ # *" $absdir "*) ;;
60+ # *) func_append compile_rpath " $absdir" ;; 63+ # *) case $absdir in
64+ # "$progdir/"*) func_append compile_rpath " $absdir" ;;
65+ # esac
61+ # esac 66+ # esac
62+ # ;; 67+ # ;;
63+ #esac 68+ #esac
64 case " $sys_lib_dlsearch_path " in 69 case " $sys_lib_dlsearch_path " in
65 *" $libdir "*) ;; 70 *" $libdir "*) ;;
66 *) 71 *)
67@@ -6236,15 +6236,15 @@ func_mode_link () 72@@ -6352,17 +6352,17 @@ func_mode_link ()
68 # Hardcode the library path. 73 # Hardcode the library path.
69 # Skip directories that are in the system default run-time 74 # Skip directories that are in the system default run-time
70 # search path. 75 # search path.
@@ -73,7 +78,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
73- *) 78- *)
74- case "$compile_rpath " in 79- case "$compile_rpath " in
75- *" $absdir "*) ;; 80- *" $absdir "*) ;;
76- *) func_append compile_rpath " $absdir" ;; 81- *) case $absdir in
82- "$progdir/"*) func_append compile_rpath " $absdir" ;;
83- esac
77- esac 84- esac
78- ;; 85- ;;
79- esac 86- esac
@@ -82,14 +89,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
82+ #*) 89+ #*)
83+ # case "$compile_rpath " in 90+ # case "$compile_rpath " in
84+ # *" $absdir "*) ;; 91+ # *" $absdir "*) ;;
85+ # *) func_append compile_rpath " $absdir" ;; 92+ # *) case $absdir in
93+ # "$progdir/"*) func_append compile_rpath " $absdir" ;;
94+ # esac
86+ # esac 95+ # esac
87+ # ;; 96+ # ;;
88+ #esac 97+ #esac
89 case " $sys_lib_dlsearch_path " in 98 case " $sys_lib_dlsearch_path " in
90 *" $libdir "*) ;; 99 *" $libdir "*) ;;
91 *) 100 *)
92@@ -6590,8 +6590,8 @@ func_mode_link () 101@@ -6705,8 +6705,8 @@ func_mode_link ()
93 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 102 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
94 test -z "$libdir" && \ 103 test -z "$libdir" && \
95 func_fatal_error "'$deplib' is not a valid libtool archive" 104 func_fatal_error "'$deplib' is not a valid libtool archive"
diff --git a/meta/recipes-devtools/libtool/libtool_2.5.2.bb b/meta/recipes-devtools/libtool/libtool_2.5.2.bb
new file mode 100644
index 0000000000..c1e315aece
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool_2.5.2.bb
@@ -0,0 +1,21 @@
1require libtool-${PV}.inc
2require remove-buildpaths.inc
3
4SRC_URI += "file://multilib.patch"
5
6RDEPENDS:${PN} += "bash"
7
8#
9# We want the results of libtool-cross preserved - don't stage anything ourselves.
10#
11SYSROOT_DIRS_IGNORE += " \
12 ${bindir} \
13 ${datadir}/aclocal \
14 ${datadir}/libtool/build-aux \
15"
16
17ACLOCALEXTRAPATH:class-target = ""
18
19inherit multilib_script
20
21MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb
index 86c55ded7b..2589bd617e 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb
@@ -1,4 +1,5 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2require remove-buildpaths.inc
2 3
3FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" 4FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
4 5
@@ -9,13 +10,6 @@ inherit nativesdk
9S = "${WORKDIR}/libtool-${PV}" 10S = "${WORKDIR}/libtool-${PV}"
10FILES:${PN} += "${datadir}/libtool/*" 11FILES:${PN} += "${datadir}/libtool/*"
11 12
12do_configure:prepend () {
13 # Remove any existing libtool m4 since old stale versions would break
14 # any upgrade
15 rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
16 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
17}
18
19do_install () { 13do_install () {
20 autotools_do_install 14 autotools_do_install
21 install -d ${D}${bindir}/ 15 install -d ${D}${bindir}/
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.7.bb b/meta/recipes-devtools/libtool/remove-buildpaths.inc
index 44a4950574..1ca95aeace 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/remove-buildpaths.inc
@@ -1,20 +1,3 @@
1require libtool-${PV}.inc
2
3SRC_URI += "file://multilib.patch"
4
5RDEPENDS:${PN} += "bash"
6
7#
8# We want the results of libtool-cross preserved - don't stage anything ourselves.
9#
10SYSROOT_DIRS_IGNORE += " \
11 ${bindir} \
12 ${datadir}/aclocal \
13 ${datadir}/libtool/build-aux \
14"
15
16ACLOCALEXTRAPATH:class-target = ""
17
18do_install:append () { 1do_install:append () {
19 sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ 2 sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \
20 -e "s@${DEBUG_PREFIX_MAP}@@g" \ 3 -e "s@${DEBUG_PREFIX_MAP}@@g" \
@@ -28,7 +11,3 @@ do_install:append () {
28 -e "s@${HOSTTOOLS_DIR}/@@g" \ 11 -e "s@${HOSTTOOLS_DIR}/@@g" \
29 -i ${D}${bindir}/libtool 12 -i ${D}${bindir}/libtool
30} 13}
31
32inherit multilib_script
33
34MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-26 06:48:33 +0000