tor

commit d7cf8f3fd1ff721952f87846aa71fdb0c3ab2e54
parent fc771163d9f0aad72614e9806742a0a289e40644
Author: Alexander Hansen Færøy <ahf@torproject.org>
Date:   Thu, 12 Feb 2026 00:12:25 +0100

Look for libraries in lib64/ in addition to lib/

When building OpenSSL 3.5.x on 64-bit systems, their build-system no
longer puts the shared and static libraries into the lib/ directory, but
instead uses lib64/.

OpenSSL has started bundling pkg-config files that we could use, but the
current acinclude-based macros seems quite battle tested for now, so
this patch is instead adding support for looking for lib64/, but with a
preference for lib/ if that exists. This shouldn't break any current
setup where there may be both a lib/ and a lib64/.

Diffstat:
M
acinclude.m4
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
@@ -9,6 +9,8 @@ AC_DEFUN([TOR_EXTEND_CODEPATH],
 [
   if test -d "$1/lib"; then
     LDFLAGS="-L$1/lib $LDFLAGS"
+  elif test -d "$1/lib64"; then
+    LDFLAGS="-L$1/lib64 $LDFLAGS"
   else
     LDFLAGS="-L$1 $LDFLAGS"
   fi
@@ -28,6 +30,9 @@ AC_DEFUN([TOR_DEFINE_CODEPATH],
    if test -d "$1/lib"; then
      TOR_LDFLAGS_$2="-L$1/lib"
      TOR_LIBDIR_$2="$1/lib"
+   elif test -d "$1/lib64"; then
+     TOR_LDFLAGS_$2="-L$1/lib64"
+     TOR_LIBDIR_$2="$1/lib64"
    else
      TOR_LDFLAGS_$2="-L$1"
      TOR_LIBDIR_$2="$1"