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