| 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> |
| |
| Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> |
| |
| --- a/build-aux/ltmain.in |
| +++ b/build-aux/ltmain.in |
| @@ -2381,8 +2381,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 |