diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-23 13:36:45 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-23 13:39:11 +0200 |
commit | 96e05e2e36fc3d0a893702a7c445aac0348320a4 (patch) | |
tree | 9cbef27b2da89c1f2d6f099965bbc5e503cc46f3 /tools/libtool/patches/150-trailingslash.patch | |
parent | 93f488fc37d6cd1f54eaf69385fe9011fe6d3c59 (diff) | |
download | upstream-96e05e2e36fc3d0a893702a7c445aac0348320a4.tar.gz upstream-96e05e2e36fc3d0a893702a7c445aac0348320a4.tar.bz2 upstream-96e05e2e36fc3d0a893702a7c445aac0348320a4.zip |
libtool: Revert "libtool: bump to 2.4.6"
This breaks the package builds using the SDK.
The targets all build fine, but the package builder fails on many
packages. The package builder uses the OpenWrt SDK.
This reverts commit c377d874bededfad971530aeb7d7e1b43cd3e61a.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/libtool/patches/150-trailingslash.patch')
-rw-r--r-- | tools/libtool/patches/150-trailingslash.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/tools/libtool/patches/150-trailingslash.patch b/tools/libtool/patches/150-trailingslash.patch new file mode 100644 index 0000000000..423911cf4b --- /dev/null +++ b/tools/libtool/patches/150-trailingslash.patch @@ -0,0 +1,49 @@ +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> + +--- a/libltdl/config/ltmain.m4sh ++++ b/libltdl/config/ltmain.m4sh +@@ -2167,8 +2167,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 +--- a/libltdl/config/ltmain.sh ++++ b/libltdl/config/ltmain.sh +@@ -2954,8 +2954,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 |