0008-libtool.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 5117519c1897a49b09fe7fff213b9c2ea15d37f5 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Fri, 29 Mar 2013 09:29:11 +0400
  4. Subject: [PATCH] libtool
  5. libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64
  6. when running on am x86_64 build host.
  7. This patch stops this speading to libdir in the libstdc++.la file within libtool.
  8. Arguably, it shouldn't be passing this into libtool in the first place but
  9. for now this resolves the nastiest problems this causes.
  10. func_normal_abspath would resolve an empty path to `pwd` so we need
  11. to filter the zero case.
  12. RP 2012/8/24
  13. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  14. Upstream-Status: Pending
  15. ---
  16. ltmain.sh | 4 ++++
  17. 1 file changed, 4 insertions(+)
  18. diff --git a/ltmain.sh b/ltmain.sh
  19. index 70990740b6c..ee938056bef 100644
  20. --- a/ltmain.sh
  21. +++ b/ltmain.sh
  22. @@ -6359,6 +6359,10 @@ func_mode_link ()
  23. func_warning "ignoring multiple \`-rpath's for a libtool library"
  24. install_libdir="$1"
  25. + if test -n "$install_libdir"; then
  26. + func_normal_abspath "$install_libdir"
  27. + install_libdir=$func_normal_abspath_result
  28. + fi
  29. oldlibs=
  30. if test -z "$rpath"; then