From 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 17 Aug 2016 14:31:25 -0500 Subject: yocto-poky: Move to import-layers subdir We are going to import additional layers, so create a subdir to hold all of the layers that we import with git-subtree. Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799 Signed-off-by: Patrick Williams --- .../libtool/libtool/trailingslash.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch (limited to 'import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch') diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch new file mode 100644 index 000000000..e8824d7db --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch @@ -0,0 +1,35 @@ +Upstream-Status: Pending + +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 + +Date: 2010/07/12 +Nitin A Kamble + +Updated by: Robert Yang + +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,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 -- cgit v1.2.1