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.0.inc40
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.5.4.inc36
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb)2
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.5.4.bb (renamed from meta/recipes-devtools/libtool/libtool-native_2.5.0.bb)0
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch36
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch (renamed from meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch)24
-rw-r--r--meta/recipes-devtools/libtool/libtool/0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch (renamed from meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch)25
-rw-r--r--meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch (renamed from meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch)23
-rw-r--r--meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch26
-rw-r--r--meta/recipes-devtools/libtool/libtool/0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch (renamed from meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch)19
-rw-r--r--meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch (renamed from meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch)21
-rw-r--r--meta/recipes-devtools/libtool/libtool/0006-libtool-Fix-tools-path-issues.patch (renamed from meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch)19
-rw-r--r--meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch (renamed from meta/recipes-devtools/libtool/libtool/multilib.patch)23
-rw-r--r--meta/recipes-devtools/libtool/libtool/0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch (renamed from meta/recipes-devtools/libtool/libtool/fixinstall.patch)54
-rw-r--r--meta/recipes-devtools/libtool/libtool/filefix.patch30
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.5.4.bb17
-rw-r--r--meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb (renamed from meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb)5
-rw-r--r--meta/recipes-devtools/libtool/remove-buildpaths.inc (renamed from meta/recipes-devtools/libtool/libtool_2.5.0.bb)21
18 files changed, 206 insertions, 215 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc
deleted file mode 100644
index e0c9aae387..0000000000
--- a/meta/recipes-devtools/libtool/libtool-2.5.0.inc
+++ /dev/null
@@ -1,40 +0,0 @@
1SUMMARY = "Generic library support script"
2DESCRIPTION = "This is GNU libtool, a generic library support script. \
3Libtool hides the complexity of generating special library types \
4(such as shared libraries) behind a consistent interface."
5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
6SECTION = "devel"
7LICENSE = "GPL-2.0-only & LGPL-2.1-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c "
10
11SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \
12 file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \
13 file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \
14 file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
15 file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
16 file://dont-depend-on-help2man.patch \
17 file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \
18 file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \
19 file://nohardcodepaths.patch \
20 file://filefix.patch \
21 "
22
23
24
25SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23"
26
27inherit autotools texinfo
28EXTRA_AUTORECONF = "--exclude=libtoolize"
29
30CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
31
32DEPENDS = "libtool-native"
33
34PACKAGES =+ "libltdl"
35FILES:${PN} += "${datadir}/aclocal"
36
37FILES:${PN}-dev:remove = "${datadir}/aclocal"
38FILES:libltdl = "${libdir}/libltdl${SOLIBS}"
39
40export CONFIG_SHELL="/bin/bash"
diff --git a/meta/recipes-devtools/libtool/libtool-2.5.4.inc b/meta/recipes-devtools/libtool/libtool-2.5.4.inc
new file mode 100644
index 0000000000..4d9a822de2
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool-2.5.4.inc
@@ -0,0 +1,36 @@
1SUMMARY = "Generic library support script"
2DESCRIPTION = "This is GNU libtool, a generic library support script. \
3Libtool hides the complexity of generating special library types \
4(such as shared libraries) behind a consistent interface."
5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
6SECTION = "devel"
7LICENSE = "GPL-2.0-only & LGPL-2.1-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
9 file://libltdl/COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 "
10
11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
12 file://0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
13 file://0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
14 file://0003-libtool-remove-help2man-dependency.patch \
15 file://0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch \
16 file://0005-libtool-Check-for-static-libs-for-internal-compiler-.patch \
17 file://0006-libtool-Fix-tools-path-issues.patch \
18 file://0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch \
19 "
20
21SRC_URI[sha256sum] = "da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf"
22
23inherit autotools texinfo
24EXTRA_AUTORECONF = "--exclude=libtoolize"
25
26CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
27
28DEPENDS = "libtool-native"
29
30PACKAGES =+ "libltdl"
31FILES:${PN} += "${datadir}/aclocal"
32
33FILES:${PN}-dev:remove = "${datadir}/aclocal"
34FILES:libltdl = "${libdir}/libltdl${SOLIBS}"
35
36export CONFIG_SHELL = "/bin/bash"
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb
index 18849cb8ef..33ea706adb 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb
@@ -1,7 +1,7 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PACKAGES = "" 3PACKAGES = ""
4SRC_URI += "file://fixinstall.patch" 4SRC_URI += "file://0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch"
5 5
6datadir = "${STAGING_DIR_TARGET}${target_datadir}" 6datadir = "${STAGING_DIR_TARGET}${target_datadir}"
7 7
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.4.bb
index be96b52dd6..be96b52dd6 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.5.4.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
deleted file mode 100644
index d5d906e6b6..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From: Richard Purdie <richard.purdie@linuxfoundation.org>
2Subject: [PATCH 01/12] ltmain.in: Handle trailing slashes on install commands correctly
3
4A command like:
5
6libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/image/usr/lib/gnome-keyring/standalone/'
7
8where the path ends with a trailing slash currently fails. This occurs in
9software like gnome-keyring or pulseaudio and is because the comparision
10code doesn't see the paths as equal. Strip both paths to ensure this works
11reliably.
12
13Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14
15Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html]
16
17Index: libtool-2.5.0/build-aux/ltmain.in
18===================================================================
19--- libtool-2.5.0.orig/build-aux/ltmain.in
20+++ libtool-2.5.0/build-aux/ltmain.in
21@@ -2382,8 +2382,14 @@ func_mode_install ()
22 func_append dir "$objdir"
23
24 if test -n "$relink_command"; then
25+ # Strip any trailing slash from the destination.
26+ func_stripname '' '/' "$libdir"
27+ destlibdir=$func_stripname_result
28+ func_stripname '' '/' "$destdir"
29+ s_destdir=$func_stripname_result
30+
31 # Determine the prefix the user has applied to our future dir.
32- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
33+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
34
35 # Don't allow the user to place us outside of our expected
36 # location b/c this prevents finding dependent libraries that
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/0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
index a6b3313d71..bcffb7d1ae 100644
--- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
+++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
@@ -1,5 +1,7 @@
1From 16354097285634daf0240d428bc49fba95c3a291 Mon Sep 17 00:00:00 2001
1From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
2Subject: [PATCH 04/12] ltmain.sh: Fix sysroot paths being encoded into RPATHs 3Date: Tue, 26 Nov 2024 09:57:35 +0000
4Subject: [PATCH 1/7] ltmain.sh: Fix sysroot paths being encoded into RPATHs
3 5
4There is a bug where RPATHs could end up containing sysroot values when 6There is a bug where RPATHs could end up containing sysroot values when
5cross compiling which is obviously incorrect. Strip out sysroot components 7cross compiling which is obviously incorrect. Strip out sysroot components
@@ -8,12 +10,15 @@ from libdir when building RPATH values to avoid this.
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 11
10Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] 12Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html]
13---
14 build-aux/ltmain.in | 14 ++++++++++++--
15 1 file changed, 12 insertions(+), 2 deletions(-)
11 16
12Index: libtool-2.5.0/build-aux/ltmain.in 17diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
13=================================================================== 18index fa157775..c31faebd 100644
14--- libtool-2.5.0.orig/build-aux/ltmain.in 19--- a/build-aux/ltmain.in
15+++ libtool-2.5.0/build-aux/ltmain.in 20+++ b/build-aux/ltmain.in
16@@ -7584,9 +7584,11 @@ func_mode_link () 21@@ -7764,9 +7764,11 @@ func_mode_link ()
17 test relink = "$opt_mode" || rpath=$compile_rpath$rpath 22 test relink = "$opt_mode" || rpath=$compile_rpath$rpath
18 for libdir in $rpath; do 23 for libdir in $rpath; do
19 if test -n "$hardcode_libdir_flag_spec"; then 24 if test -n "$hardcode_libdir_flag_spec"; then
@@ -27,7 +32,7 @@ Index: libtool-2.5.0/build-aux/ltmain.in
27 if test -z "$hardcode_libdirs"; then 32 if test -z "$hardcode_libdirs"; then
28 hardcode_libdirs=$libdir 33 hardcode_libdirs=$libdir
29 else 34 else
30@@ -8316,6 +8318,10 @@ func_mode_link () 35@@ -8496,6 +8498,10 @@ func_mode_link ()
31 hardcode_libdirs= 36 hardcode_libdirs=
32 for libdir in $compile_rpath $finalize_rpath; do 37 for libdir in $compile_rpath $finalize_rpath; do
33 if test -n "$hardcode_libdir_flag_spec"; then 38 if test -n "$hardcode_libdir_flag_spec"; then
@@ -38,7 +43,7 @@ Index: libtool-2.5.0/build-aux/ltmain.in
38 if test -n "$hardcode_libdir_separator"; then 43 if test -n "$hardcode_libdir_separator"; then
39 if test -z "$hardcode_libdirs"; then 44 if test -z "$hardcode_libdirs"; then
40 hardcode_libdirs=$libdir 45 hardcode_libdirs=$libdir
41@@ -8367,6 +8373,10 @@ func_mode_link () 46@@ -8547,6 +8553,10 @@ func_mode_link ()
42 hardcode_libdirs= 47 hardcode_libdirs=
43 for libdir in $finalize_rpath; do 48 for libdir in $finalize_rpath; do
44 if test -n "$hardcode_libdir_flag_spec"; then 49 if test -n "$hardcode_libdir_flag_spec"; then
@@ -49,3 +54,6 @@ Index: libtool-2.5.0/build-aux/ltmain.in
49 if test -n "$hardcode_libdir_separator"; then 54 if test -n "$hardcode_libdir_separator"; then
50 if test -z "$hardcode_libdirs"; then 55 if test -z "$hardcode_libdirs"; then
51 hardcode_libdirs=$libdir 56 hardcode_libdirs=$libdir
57--
582.39.5
59
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/0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch
index 54e602f118..2ece455969 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/0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch
@@ -1,5 +1,8 @@
1From 59b6032698d10306ffb3be3cbf76690409d7f9a6 Mon Sep 17 00:00:00 2001
1From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
2Subject: [PATCH 05/12] ltmain.in: Don't encode RATHS which match default linker paths 3Date: Tue, 26 Nov 2024 09:57:36 +0000
4Subject: [PATCH 2/7] ltmain.in: Don't encode RATHS which match default linker
5 paths
3 6
4We don't want to add RPATHS which match default linker search paths, they're 7We don't want to add RPATHS which match default linker search paths, they're
5a waste of space. This patch filters libtools list of paths to encoode and 8a waste of space. This patch filters libtools list of paths to encoode and
@@ -11,12 +14,15 @@ the paths before comparision.
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 14Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12 15
13Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] 16Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html]
17---
18 build-aux/ltmain.in | 34 ++++++++++++++++++++++++++++------
19 1 file changed, 28 insertions(+), 6 deletions(-)
14 20
15Index: libtool-2.5.0/build-aux/ltmain.in 21diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
16=================================================================== 22index c31faebd..44c7d81e 100644
17--- libtool-2.5.0.orig/build-aux/ltmain.in 23--- a/build-aux/ltmain.in
18+++ libtool-2.5.0/build-aux/ltmain.in 24+++ b/build-aux/ltmain.in
19@@ -7602,8 +7602,16 @@ func_mode_link () 25@@ -7782,8 +7782,16 @@ func_mode_link ()
20 esac 26 esac
21 fi 27 fi
22 else 28 else
@@ -35,7 +41,7 @@ Index: libtool-2.5.0/build-aux/ltmain.in
35 fi 41 fi
36 elif test -n "$runpath_var"; then 42 elif test -n "$runpath_var"; then
37 case "$perm_rpath " in 43 case "$perm_rpath " in
38@@ -8336,8 +8344,16 @@ func_mode_link () 44@@ -8516,8 +8524,16 @@ func_mode_link ()
39 esac 45 esac
40 fi 46 fi
41 else 47 else
@@ -54,7 +60,7 @@ Index: libtool-2.5.0/build-aux/ltmain.in
54 fi 60 fi
55 elif test -n "$runpath_var"; then 61 elif test -n "$runpath_var"; then
56 case "$perm_rpath " in 62 case "$perm_rpath " in
57@@ -8391,8 +8407,14 @@ func_mode_link () 63@@ -8571,8 +8587,14 @@ func_mode_link ()
58 esac 64 esac
59 fi 65 fi
60 else 66 else
@@ -71,3 +77,6 @@ Index: libtool-2.5.0/build-aux/ltmain.in
71 fi 77 fi
72 elif test -n "$runpath_var"; then 78 elif test -n "$runpath_var"; then
73 case "$finalize_perm_rpath " in 79 case "$finalize_perm_rpath " in
80--
812.39.5
82
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
index 0013d16544..b174827eef 100644
--- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
+++ b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
@@ -1,13 +1,21 @@
1From e3e8422333239c47ad613e2f41ee04244556d3be Mon Sep 17 00:00:00 2001
2From: Marko Lindqvist <cazfi74@gmail.com>
3Date: Mon, 7 Jan 2013 01:49:28 +0200
4Subject: [PATCH 3/7] libtool: remove help2man dependency
5
1Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
2 7
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4Updated by: Robert Yang <liezhi.yang@windriver.com> 9Updated by: Robert Yang <liezhi.yang@windriver.com>
10---
11 Makefile.am | 17 -----------------
12 1 file changed, 17 deletions(-)
5 13
6diff --git a/Makefile.am b/Makefile.am 14diff --git a/Makefile.am b/Makefile.am
7index 7bd7f72..c29860e 100644 15index 51c1fbdb..4962c3ad 100644
8--- a/Makefile.am 16--- a/Makefile.am
9+++ b/Makefile.am 17+++ b/Makefile.am
10@@ -411,21 +411,6 @@ $(notes_txt): $(notes_texi) 18@@ -408,23 +408,6 @@ $(notes_txt): $(notes_texi)
11 $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ 19 $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
12 $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)' 20 $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
13 21
@@ -22,10 +30,15 @@ index 7bd7f72..c29860e 100644
22-# manual pages if the sources for the build-tree files we want to 30-# manual pages if the sources for the build-tree files we want to
23-# run have changed. 31-# run have changed.
24-$(libtool_1): $(ltmain_sh) 32-$(libtool_1): $(ltmain_sh)
25- $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool 33- $(AM_V_GEN)$(update_mans) -n 'Provide generalized library-building support services' --help-option=--help-all libtool
26-$(libtoolize_1): $(libtoolize_in) 34-$(libtoolize_1): $(libtoolize_in)
27- $(AM_V_GEN)$(update_mans) libtoolize 35- $(AM_V_GEN)$(update_mans) -n 'Prepare a package to use libtool' libtoolize
36-
37-
28- 38-
29
30 ## ------------- ## 39 ## ------------- ##
31 ## Installation. ## 40 ## Installation. ##
41 ## ------------- ##
42--
432.39.5
44
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 2436f68a49..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch
+++ /dev/null
@@ -1,26 +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
11Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html]
12Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=3221f9f0fb98d5740ab5d0e8db6a731302520644]
13
14Index: libtool-2.5.0/build-aux/ltmain.in
15===================================================================
16--- libtool-2.5.0.orig/build-aux/ltmain.in
17+++ libtool-2.5.0/build-aux/ltmain.in
18@@ -6514,7 +6514,7 @@ func_mode_link ()
19 fi
20 else
21 # We cannot seem to hardcode it, guess we'll fake it.
22- add_dir=-L$libdir
23+ add_dir="-L$lt_sysroot$libdir"
24 # Try looking first in the location we're being installed to.
25 if test -n "$inst_prefix_dir"; then
26 case $libdir in
diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch
index feb1048b55..e8fc1bff9c 100644
--- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch
+++ b/meta/recipes-devtools/libtool/libtool/0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch
@@ -1,20 +1,22 @@
1libtool.m4: Change libtool to handle sysroots by default 1From 3bb376ff4832e2bd1aaee5530b4b926e3f7407c0 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Sat, 14 Sep 2013 09:01:38 +0000
4Subject: [PATCH 4/7] libtool.m4: Change libtool to handle sysroots by default
2 5
3Rather than using no sysroot by default, always query gcc to obtain the sysroot. 6Rather than using no sysroot by default, always query gcc to obtain the sysroot.
4 7
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 9
7Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default] 10Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default]
8
9--- 11---
10 m4/libtool.m4 | 6 +++--- 12 m4/libtool.m4 | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-) 13 1 file changed, 3 insertions(+), 3 deletions(-)
12 14
13Index: libtool-2.5.0/m4/libtool.m4 15diff --git a/m4/libtool.m4 b/m4/libtool.m4
14=================================================================== 16index 8d323b3e..3650c87c 100644
15--- libtool-2.5.0.orig/m4/libtool.m4 17--- a/m4/libtool.m4
16+++ libtool-2.5.0/m4/libtool.m4 18+++ b/m4/libtool.m4
17@@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq 19@@ -1288,18 +1288,18 @@ dnl lt_sysroot will always be passed unquoted. We quote it here
18 dnl in case the user passed a directory name. 20 dnl in case the user passed a directory name.
19 lt_sysroot= 21 lt_sysroot=
20 case $with_sysroot in #( 22 case $with_sysroot in #(
@@ -36,3 +38,6 @@ Index: libtool-2.5.0/m4/libtool.m4
36 *) 38 *)
37 AC_MSG_RESULT([$with_sysroot]) 39 AC_MSG_RESULT([$with_sysroot])
38 AC_MSG_ERROR([The sysroot must be an absolute path.]) 40 AC_MSG_ERROR([The sysroot must be an absolute path.])
41--
422.39.5
43
diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
index c103ebb7bf..5a4411c8e5 100644
--- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch
+++ b/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
@@ -1,5 +1,8 @@
1From 9f16cd0624641e489665415150792d9054af8a7a Mon Sep 17 00:00:00 2001
1From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
2Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries 3Date: Tue, 26 Nov 2024 09:57:39 +0000
4Subject: [PATCH 5/7] libtool: Check for static libs for internal compiler
5 libraries
3 6
4Libtool checks only for libraries linked as -l* when trying to 7Libtool checks only for libraries linked as -l* when trying to
5find internal compiler libraries. Clang, however uses the absolute 8find internal compiler libraries. Clang, however uses the absolute
@@ -14,12 +17,15 @@ https://crbug.com/749263
14https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 17https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
15 18
16Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] 19Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html]
20---
21 m4/libtool.m4 | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
17 23
18Index: libtool-2.5.0/m4/libtool.m4 24diff --git a/m4/libtool.m4 b/m4/libtool.m4
19=================================================================== 25index 3650c87c..51493a10 100644
20--- libtool-2.5.0.orig/m4/libtool.m4 26--- a/m4/libtool.m4
21+++ libtool-2.5.0/m4/libtool.m4 27+++ b/m4/libtool.m4
22@@ -7553,7 +7553,7 @@ if AC_TRY_EVAL(ac_compile); then 28@@ -7708,7 +7708,7 @@ if AC_TRY_EVAL(ac_compile); then
23 for p in `eval "$output_verbose_link_cmd"`; do 29 for p in `eval "$output_verbose_link_cmd"`; do
24 case $prev$p in 30 case $prev$p in
25 31
@@ -28,3 +34,6 @@ Index: libtool-2.5.0/m4/libtool.m4
28 # Some compilers place space between "-{L,R,l}" and the path. 34 # Some compilers place space between "-{L,R,l}" and the path.
29 # Remove the space. 35 # Remove the space.
30 if test x-L = x"$p" || 36 if test x-L = x"$p" ||
37--
382.39.5
39
diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool-Fix-tools-path-issues.patch
index fcbce7286b..9788433ab8 100644
--- a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
+++ b/meta/recipes-devtools/libtool/libtool/0006-libtool-Fix-tools-path-issues.patch
@@ -1,3 +1,8 @@
1From c04839effba0538c982422275c5cda5947aa0e85 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 3 Feb 2015 14:24:58 +0000
4Subject: [PATCH 6/7] libtool: Fix tools path issues
5
1If for example you build on a machine with /bin/grep, then restore that sstate 6If for example you build on a machine with /bin/grep, then restore that sstate
2onto a machine with /usr/bin/grep, things will fail. Simply don't bother 7onto a machine with /usr/bin/grep, things will fail. Simply don't bother
3hardcoding paths. 8hardcoding paths.
@@ -5,11 +10,14 @@ hardcoding paths.
5RP 2015/2/3 10RP 2015/2/3
6 11
7Upstream-Status: Inappropriate 12Upstream-Status: Inappropriate
13---
14 libtoolize.in | 10 +++++-----
15 1 file changed, 5 insertions(+), 5 deletions(-)
8 16
9Index: libtool-2.4.5/libtoolize.in 17diff --git a/libtoolize.in b/libtoolize.in
10=================================================================== 18index 6c15aa57..8beb670e 100644
11--- libtool-2.4.5.orig/libtoolize.in 19--- a/libtoolize.in
12+++ libtool-2.4.5/libtoolize.in 20+++ b/libtoolize.in
13@@ -40,11 +40,11 @@ 21@@ -40,11 +40,11 @@
14 22
15 : ${AUTOCONF="autoconf"} 23 : ${AUTOCONF="autoconf"}
@@ -27,3 +35,6 @@ Index: libtool-2.4.5/libtoolize.in
27 35
28 36
29 ## -------------------------- ## 37 ## -------------------------- ##
38--
392.39.5
40
diff --git a/meta/recipes-devtools/libtool/libtool/multilib.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch
index 018f066652..bcb372bbc1 100644
--- a/meta/recipes-devtools/libtool/libtool/multilib.patch
+++ b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch
@@ -1,3 +1,8 @@
1From 083cf39140cd894ea306b67411d6088c13a9e286 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Mon, 30 Jul 2018 17:00:01 +0000
4Subject: [PATCH 7/7] libtool: Fix problem with libtoolize in multilib
5
1Without this patch /usr/bin/libtoolize is different for each multilib 6Without this patch /usr/bin/libtoolize is different for each multilib
2since their host-triplets are different, despite there being no difference in 7since their host-triplets are different, despite there being no difference in
3the functionality of libtoolize itself. 8the functionality of libtoolize itself.
@@ -7,17 +12,23 @@ libXX-libtool couldn't be installed into the same system.
7 12
8Upstream-Status: Inappropriate 13Upstream-Status: Inappropriate
9RP 2018/7/30 14RP 2018/7/30
15---
16 libtoolize.in | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
10 18
11Index: libtool-2.4.6/libtoolize.in 19diff --git a/libtoolize.in b/libtoolize.in
12=================================================================== 20index 8beb670e..c89a093c 100644
13--- libtool-2.4.6.orig/libtoolize.in 21--- a/libtoolize.in
14+++ libtool-2.4.6/libtoolize.in 22+++ b/libtoolize.in
15@@ -113,7 +113,7 @@ You must 'cd' to the top directory of yo 23@@ -139,7 +139,7 @@ You must 'cd' to the top directory of your package before you run
16 When reporting a bug, please describe a test case to reproduce it and 24 When reporting a bug, please describe a test case to reproduce it and
17 include the following information: 25 include the following information:
18 26
19- host-triplet: @host_triplet@ 27- host-triplet: @host_triplet@
20+ host-triplet <redacted> 28+ host-triplet <redacted>
21 version: $progname (GNU @PACKAGE@) @VERSION@ 29 version: $progname $scriptversion
22 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` 30 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
23 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` 31 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
32--
332.39.5
34
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch
index 48330d82fb..267c3ab140 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch
@@ -1,5 +1,10 @@
1From 78eac8c99451681f4c403b3ea727ee61651a3c1a Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 16 Nov 2011 16:58:34 +0000
4Subject: [PATCH] libtool: Avoid relinking when cross compiling, its pointless
5
1There is no point in having "executable" binaries in the .libs 6There is no point in having "executable" binaries in the .libs
2directory linked with different rpaths to the target which 7directory linked with different rpaths to the target which
3could concivably be run on the build system when cross compiling. 8could concivably be run on the build system when cross compiling.
4 9
5This patch removes the extra rpaths ($compile_rpath) so that the 10This patch removes the extra rpaths ($compile_rpath) so that the
@@ -17,11 +22,15 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
17RP 2011/11/16 22RP 2011/11/16
18 23
19Updated by: Robert Yang <liezhi.yang@windriver.com> 24Updated by: Robert Yang <liezhi.yang@windriver.com>
25---
26 build-aux/ltmain.in | 56 ++++++++++++++++++++++-----------------------
27 1 file changed, 28 insertions(+), 28 deletions(-)
20 28
21diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in 29diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
30index fa157775..816ea5a0 100644
22--- a/build-aux/ltmain.in 31--- a/build-aux/ltmain.in
23+++ b/build-aux/ltmain.in 32+++ b/build-aux/ltmain.in
24@@ -2355,7 +2355,7 @@ func_mode_install () 33@@ -2513,7 +2513,7 @@ func_mode_install ()
25 dir=$func_dirname_result 34 dir=$func_dirname_result
26 func_append dir "$objdir" 35 func_append dir "$objdir"
27 36
@@ -29,8 +38,8 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
29+ if test "$fast_install" = no && test -n "$relink_command"; then 38+ if test "$fast_install" = no && test -n "$relink_command"; then
30 # Strip any trailing slash from the destination. 39 # Strip any trailing slash from the destination.
31 func_stripname '' '/' "$libdir" 40 func_stripname '' '/' "$libdir"
32 destlibdir=$func_stripname_result 41 destlibdir=$func_stripname_result
33@@ -2394,7 +2394,7 @@ func_mode_install () 42@@ -2552,7 +2552,7 @@ func_mode_install ()
34 shift 43 shift
35 44
36 srcname=$realname 45 srcname=$realname
@@ -39,57 +48,69 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
39 48
40 # Install the shared library and build the symlinks. 49 # Install the shared library and build the symlinks.
41 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 50 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
42@@ -6162,15 +6162,15 @@ func_mode_link () 51@@ -6411,18 +6411,18 @@ func_mode_link ()
43 # Hardcode the library path. 52 # Hardcode the library path.
44 # Skip directories that are in the system default run-time 53 # Skip directories that are in the system default run-time
45 # search path. 54 # search path.
46- case " $sys_lib_dlsearch_path " in 55- case " $sys_lib_dlsearch_path " in
47- *" $absdir "*) ;; 56- *" $absdir "*) ;;
48- *) 57- *)
49- case "$compile_rpath " in 58- case "$compile_rpath$compile_rpath_tail " in
50- *" $absdir "*) ;; 59- *" $absdir "*) ;;
51- *) func_append compile_rpath " $absdir" ;; 60- *) case $absdir in
61- "$progdir/"*) func_append compile_rpath " $absdir" ;;
62- *) func_append compile_rpath_tail " $absdir" ;;
63- esac
52- esac 64- esac
53- ;; 65- ;;
54- esac 66- esac
55+ #case " $sys_lib_dlsearch_path " in 67+ #case " $sys_lib_dlsearch_path " in
56+ #*" $absdir "*) ;; 68+ #*" $absdir "*) ;;
57+ #*) 69+ #*)
58+ # case "$compile_rpath " in 70+ # case "$compile_rpath$compile_rpath_tail " in
59+ # *" $absdir "*) ;; 71+ # *" $absdir "*) ;;
60+ # *) func_append compile_rpath " $absdir" ;; 72+ # *) case $absdir in
73+ # "$progdir/"*) func_append compile_rpath " $absdir" ;;
74+ # *) func_append compile_rpath_tail " $absdir" ;;
75+ # esac
61+ # esac 76+ # esac
62+ # ;; 77+ # ;;
63+ #esac 78+ #esac
64 case " $sys_lib_dlsearch_path " in 79 case " $sys_lib_dlsearch_path " in
65 *" $libdir "*) ;; 80 *" $libdir "*) ;;
66 *) 81 *)
67@@ -6236,15 +6236,15 @@ func_mode_link () 82@@ -6488,18 +6488,18 @@ func_mode_link ()
68 # Hardcode the library path. 83 # Hardcode the library path.
69 # Skip directories that are in the system default run-time 84 # Skip directories that are in the system default run-time
70 # search path. 85 # search path.
71- case " $sys_lib_dlsearch_path " in 86- case " $sys_lib_dlsearch_path " in
72- *" $absdir "*) ;; 87- *" $absdir "*) ;;
73- *) 88- *)
74- case "$compile_rpath " in 89- case "$compile_rpath$compile_rpath_tail " in
75- *" $absdir "*) ;; 90- *" $absdir "*) ;;
76- *) func_append compile_rpath " $absdir" ;; 91- *) case $absdir in
92- "$progdir/"*) func_append compile_rpath " $absdir" ;;
93- *) func_append compile_rpath_tail " $absdir" ;;
94- esac
77- esac 95- esac
78- ;; 96- ;;
79- esac 97- esac
80+ #case " $sys_lib_dlsearch_path " in 98+ #case " $sys_lib_dlsearch_path " in
81+ #*" $absdir "*) ;; 99+ #*" $absdir "*) ;;
82+ #*) 100+ #*)
83+ # case "$compile_rpath " in 101+ # case "$compile_rpath$compile_rpath_tail " in
84+ # *" $absdir "*) ;; 102+ # *" $absdir "*) ;;
85+ # *) func_append compile_rpath " $absdir" ;; 103+ # *) case $absdir in
104+ # "$progdir/"*) func_append compile_rpath " $absdir" ;;
105+ # *) func_append compile_rpath_tail " $absdir" ;;
106+ # esac
86+ # esac 107+ # esac
87+ # ;; 108+ # ;;
88+ #esac 109+ #esac
89 case " $sys_lib_dlsearch_path " in 110 case " $sys_lib_dlsearch_path " in
90 *" $libdir "*) ;; 111 *" $libdir "*) ;;
91 *) 112 *)
92@@ -6590,8 +6590,8 @@ func_mode_link () 113@@ -6843,8 +6843,8 @@ func_mode_link ()
93 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 114 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
94 test -z "$libdir" && \ 115 test -z "$libdir" && \
95 func_fatal_error "'$deplib' is not a valid libtool archive" 116 func_fatal_error "'$deplib' is not a valid libtool archive"
@@ -100,3 +121,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
100 121
101 path=-L$absdir 122 path=-L$absdir
102 fi 123 fi
124--
1252.39.5
126
diff --git a/meta/recipes-devtools/libtool/libtool/filefix.patch b/meta/recipes-devtools/libtool/libtool/filefix.patch
deleted file mode 100644
index 4d85132954..0000000000
--- a/meta/recipes-devtools/libtool/libtool/filefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1[PATCH] libtool.m4: Fix AC_CHECK_PROG usage
2
3In commit:
4
5https://git.savannah.gnu.org/cgit/libtool.git/commit/m4/libtool.m4?id=64bef5ba65f6820cd5f88e5249324b4f5955ee25
6
7AC_CHECK_TOOL was changed to AC_CHECK_PROG however the arguments are
8different and this result is a value of ":". Change this to match the
9original intent.
10
11The lack of FILECMD was causing failures for mips64 builds as -m elf was
12being passed to LD which isn't supported on our targets.
13
14Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-06/msg00000.html]
15
16Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
17
18Index: libtool-2.5.0/m4/libtool.m4
19===================================================================
20--- libtool-2.5.0.orig/m4/libtool.m4
21+++ libtool-2.5.0/m4/libtool.m4
22@@ -8216,7 +8216,7 @@ AC_SUBST([DLLTOOL])
23 # ----------------
24 # Check for a file(cmd) program that can be used to detect file type and magic
25 m4_defun([_LT_DECL_FILECMD],
26-[AC_CHECK_PROG([FILECMD], [file], [:])
27+[AC_CHECK_PROG([FILECMD], [file], [file], [:])
28 _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
29 ])# _LD_DECL_FILECMD
30
diff --git a/meta/recipes-devtools/libtool/libtool_2.5.4.bb b/meta/recipes-devtools/libtool/libtool_2.5.4.bb
new file mode 100644
index 0000000000..fa16d09d21
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool_2.5.4.bb
@@ -0,0 +1,17 @@
1require libtool-${PV}.inc
2require remove-buildpaths.inc
3
4RDEPENDS:${PN} += "bash"
5
6#
7# We want the results of libtool-cross preserved - don't stage anything ourselves.
8#
9SYSROOT_DIRS_IGNORE += " \
10 ${bindir} \
11 ${datadir}/aclocal \
12 ${datadir}/libtool/build-aux \
13"
14
15inherit multilib_script
16
17MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb
index ddb60e717c..de556a5d81 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb
@@ -1,12 +1,13 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2require remove-buildpaths.inc
2 3
3FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" 4FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
4 5
5SRC_URI += "file://fixinstall.patch" 6SRC_URI += "file://0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch"
6 7
7inherit nativesdk 8inherit nativesdk
8 9
9S = "${WORKDIR}/libtool-${PV}" 10S = "${UNPACKDIR}/libtool-${PV}"
10FILES:${PN} += "${datadir}/libtool/*" 11FILES:${PN} += "${datadir}/libtool/*"
11 12
12do_install () { 13do_install () {
diff --git a/meta/recipes-devtools/libtool/libtool_2.5.0.bb b/meta/recipes-devtools/libtool/remove-buildpaths.inc
index 44a4950574..1ca95aeace 100644
--- a/meta/recipes-devtools/libtool/libtool_2.5.0.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"