mirror of
https://git.yoctoproject.org/poky
synced 2026-03-11 09:49:41 +01:00
544c53bd75
I went through and cleaned up the headers/descriptions on several of the libtool patchset and submitted (or resubmitted in some cases) them upstream. This patch updates/renames them to match what I did. I did fix some whitespace issues in some of the patches and also merged one case where we had a patch of already patched code. This makes it clear what was submitted and makes resubmission easier if ever needed too. (From OE-Core rev: 9bb9a4e8bd408c7a42913aa3e1ec541919b59584) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
36 lines
1.4 KiB
Diff
36 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
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -2356,8 +2356,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
|