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