0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From 88a0442a0f01076914af80db40571fd52914ffa3 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Thu, 28 Mar 2019 23:52:38 +0100
  4. Subject: [PATCH] revert ITS#3977, fix libtool -static behavior to match docs
  5. Revert
  6. https://github.com/openldap/openldap/commit/7b6a088a2590fdad10286d10050b769e48554e13
  7. as this patch does not work with our buildroot patches
  8. Fixes:
  9. - http://autobuild.buildroot.org/results/ab4f85fd21cacfaef6b0b43a38da6a4a1d32ecb6
  10. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  11. [Upstream status: Not upstreamable]
  12. ---
  13. build/ltmain.sh | 9 ++-------
  14. 1 file changed, 2 insertions(+), 7 deletions(-)
  15. diff --git a/build/ltmain.sh b/build/ltmain.sh
  16. index 1d079b91e..996dc7dad 100755
  17. --- a/build/ltmain.sh
  18. +++ b/build/ltmain.sh
  19. @@ -1190,15 +1190,14 @@ EOF
  20. if test -n "$link_static_flag"; then
  21. dlopen_self=$dlopen_self_static
  22. fi
  23. - prefer_static_libs=yes
  24. else
  25. if test -z "$pic_flag" && test -n "$link_static_flag"; then
  26. dlopen_self=$dlopen_self_static
  27. fi
  28. - prefer_static_libs=built
  29. fi
  30. build_libtool_libs=no
  31. build_old_libs=yes
  32. + prefer_static_libs=yes
  33. break
  34. ;;
  35. esac
  36. @@ -2602,12 +2601,8 @@ EOF
  37. fi
  38. link_static=no # Whether the deplib will be linked statically
  39. - use_static_libs=$prefer_static_libs
  40. - if test "$use_static_libs" = built && test "$installed" = yes ; then
  41. - use_static_libs=no
  42. - fi
  43. if test -n "$library_names" &&
  44. - { test "$use_static_libs" = no || test -z "$old_library"; }; then
  45. + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
  46. if test "$installed" = no; then
  47. notinst_deplibs="$notinst_deplibs $lib"
  48. need_relink=yes
  49. --
  50. 2.14.1