From 75dd9e034a2a0f9d00f804894e20239ec950a84c Mon Sep 17 00:00:00 2001
From: Krystie <krystie@sami-ahmed.net>
Date: Wed, 24 Jun 2026 19:42:26 -0700
Subject: [PATCH] build: target libtor.a only + add autotools to Windows msys2
 install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Run #468 (the re-trigger after #467's fixes) failed with two more issues:

  1. Linux build-libtor step needed static OpenSSL libs (libssl.a,
     libcrypto.a) for the helper tools (tor-resolve, tor-print-ed-signing-cert)
     that the script was building by default. Ubuntu's libssl-dev
     package only ships the shared .so libs, not the static .a ones.
     We don't actually need the helper tools — Triangles only consumes
     libtor.a. Changed 'make' to 'make libtor.a' in build-libtor.sh
     so only the static library is built.

  2. Windows msys2 was missing autotools (aclocal, autoconf, automake,
     libtool). autogen.sh failed with 'aclocal: command not found'.
     Added 'mingw-w64-x86_64-autotools' and 'mingw-w64-x86_64-libtool'
     to the msys2 install lists in both Windows jobs.

If this one fails I'll show you the log. (Run #469 will be the test.)
---
 .github/workflows/build-all.yml | 2 ++
 src/tor/build-libtor.sh         | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index a7090b5..186b280 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -161,6 +161,8 @@ jobs:
             mingw-w64-x86_64-miniupnpc
             mingw-w64-x86_64-zlib
             mingw-w64-x86_64-rocksdb
+            mingw-w64-x86_64-autotools
+            mingw-w64-x86_64-libtool
 
       - name: Set VERSION
         run: |
diff --git a/src/tor/build-libtor.sh b/src/tor/build-libtor.sh
index c7e594b..c7bf959 100644
--- a/src/tor/build-libtor.sh
+++ b/src/tor/build-libtor.sh
@@ -30,8 +30,10 @@ echo "Configuring Tor static library build from: $TOR_SRC_DIR"
   --with-openssl-dir="${OPENSSL_DIR:-/mingw64}" \
   --with-zlib-dir="${ZLIB_DIR:-/mingw64}"
 
-echo "Building Tor"
-make -j"${NPROC:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)}"
+echo "Building Tor (libtor.a only — skip the helper tools like tor-resolve"
+echo "and tor-print-ed-signing-cert that pull in extra static OpenSSL and"
+echo "are not needed by Triangles)"
+make -j"${NPROC:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)}" libtor.a
 
 echo
 echo "Build finished. Inspect these locations for static libraries:"