From: David Goulet <dgoulet@torproject.org>
Date: Wed, 13 Jan 2021 14:48:45 +0000 (-0500)
Subject: m4: Change LIBS order of TOR_SEARCH_LIBRARY()
X-Git-Tag: tor-0.4.5.4-rc~15^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5817a0dafc67882f15730ee818fbcdba1b7b915;p=thirdparty%2Ftor.git

m4: Change LIBS order of TOR_SEARCH_LIBRARY()

Some gcc versions do explode if the order of the linker flags are not correct.
One issue was statically building OpenSSL which would require that "-lssl
-lcrypto" be put _before_ the "-lpthread -ldl" flags.

I have not such problem with GCC 10 but does with GCC 9.

Closes #33624

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 5ecdf1d5c2..e6389ea1d4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
 
   for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do
     LDFLAGS="$tor_saved_LDFLAGS"
-    LIBS="$tor_saved_LIBS $3"
+    LIBS="$3 $tor_saved_LIBS"
     CPPFLAGS="$tor_saved_CPPFLAGS"
 
     if test -z "$tor_trydir" ; then
@@ -219,7 +219,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
   CPPFLAGS="$tor_saved_CPPFLAGS"
 ]) dnl end cache check
 
-LIBS="$LIBS $3"
+LIBS="$3 $LIBS"
 if test "$tor_cv_library_$1_dir" != "(system)"; then
    TOR_EXTEND_CODEPATH($tor_cv_library_$1_dir)
 fi
diff --git a/changes/ticket33624 b/changes/ticket33624
new file mode 100644
index 0000000000..eded3b4dee
--- /dev/null
+++ b/changes/ticket33624
@@ -0,0 +1,5 @@
+  o Minor bugfixes (configure, static build):
+    - Change our search library configure macro linker flag order so it works
+      for certain compilers that need the right order. Fixes bug 33624; bugfix
+      on 0.1.1.0-alpha.
+