summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-09 11:41:32 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-09 11:41:32 +0000
commit8d88759685bf56db9e05510205d0180ff63a80c4 (patch)
treec1dbcde79c173016d778c6b658e741255d2545bf
parent311dd52ad8658b87009faec89028c8ebd5dae6c8 (diff)
package/libtool: Strip trailing slashes from libdir and destdir
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24376 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/libtool/patches/150-trailingslash.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/libtool/patches/150-trailingslash.patch b/package/libtool/patches/150-trailingslash.patch
new file mode 100644
index 000000000..14aa27be8
--- /dev/null
+++ b/package/libtool/patches/150-trailingslash.patch
@@ -0,0 +1,30 @@
+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
+@@ -2164,8 +2164,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