mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 10:59:41 +01:00
8ab08022f6
Our patches were rather out of sync, update the line offsets to match the current patchset/underlying code. (From OE-Core rev: f3a98cbd1c17ec25593ac11149d81ab80156a101) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Subject: [PATCH 01/12] ltmain.in: Handle trailing slashes on install commands correctly
|
|
|
|
A command like:
|
|
|
|
libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/image/usr/lib/gnome-keyring/standalone/'
|
|
|
|
where the path ends with a trailing slash currently fails. This occurs in
|
|
software like gnome-keyring or pulseaudio and is because the comparision
|
|
code doesn't see the paths as equal. Strip both paths to ensure this works
|
|
reliably.
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html]
|
|
|
|
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
|
index a5f21a1..f884824 100644
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -2381,8 +2381,14 @@ func_mode_install ()
|
|
func_append dir "$objdir"
|
|
|
|
if test -n "$relink_command"; then
|
|
+ # Strip any trailing slash from the destination.
|
|
+ func_stripname '' '/' "$libdir"
|
|
+ destlibdir=$func_stripname_result
|
|
+ func_stripname '' '/' "$destdir"
|
|
+ s_destdir=$func_stripname_result
|
|
+
|
|
# Determine the prefix the user has applied to our future dir.
|
|
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
|
|
+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
|
|
|
|
# Don't allow the user to place us outside of our expected
|
|
# location b/c this prevents finding dependent libraries that
|
|
--
|
|
2.25.1
|
|
|