diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-09-13 18:08:55 -0300 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-20 15:21:17 +0200 |
| commit | c377d874bededfad971530aeb7d7e1b43cd3e61a (patch) | |
| tree | 59bad2acbed4a61a76d1282e5f99b6de744dbb12 /tools/libtool/patches/130-trailingslash.patch | |
| parent | 8c863f604d68da05abbdc7edfdb805db79ed5ded (diff) | |
| download | upstream-c377d874bededfad971530aeb7d7e1b43cd3e61a.tar.gz upstream-c377d874bededfad971530aeb7d7e1b43cd3e61a.tar.bz2 upstream-c377d874bededfad971530aeb7d7e1b43cd3e61a.zip | |
libtool: bump to 2.4.6
This updates libtool to its current release, from 2015. Current patches
were renumbered and given a description text. The fix in
160-passthrough-ssp.patch is no longer needed.
A patch to speed up build was cherry-picked, and another openwrt
specific patch was needed to not use quotes in $(SHELL), to acommodate
our "SHELL=/usr/bin/env bash" usage.
The already present call to ./bootstrap ensures that generated files are
refreshed, so the patches are applied only to their sources. Also, that
bootstrap call was adjusted to run at the appropriate time when QUILT=1.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'tools/libtool/patches/130-trailingslash.patch')
| -rw-r--r-- | tools/libtool/patches/130-trailingslash.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/tools/libtool/patches/130-trailingslash.patch b/tools/libtool/patches/130-trailingslash.patch new file mode 100644 index 0000000000..fc28027a05 --- /dev/null +++ b/tools/libtool/patches/130-trailingslash.patch @@ -0,0 +1,38 @@ +From 1b45c3c0d6682be7f4876b620780ee246a5acbaa Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz <cotequeiroz@gmail.com> +Date: Tue, 20 Jul 2021 16:56:16 -0300 +Subject: openwrt: remove trailing slash in install destdir + +A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio) + +This is because libdir has a trailing slash which breaks the comparision. + +RP 2/1/10 + +Merged a patch received from Gary Thomas <gary@mlbassoc.com> + +Date: 2010/07/12 +Nitin A Kamble <nitin.a.kamble@intel.com> + +(adjusted to v2.4.6) +Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> + +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -2363,8 +2363,15 @@ 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 |