From aa53fae163113994f3308f55f8df05906887a102 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 15 Jan 2024 13:09:09 +0000
Subject: [PATCH] fixup visibility and .a reproducibility

---
 libpsl.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libpsl.sh b/libpsl.sh
index 7580ee5ff..a48a58eb9 100755
--- a/libpsl.sh
+++ b/libpsl.sh
@@ -6,6 +6,7 @@
 # Issues:
 # - does not support CMake (only autotools and meson). Where autotools is broken
 #   in curl-for-win.
+# - could not make symbol-hiding work with autotools.
 # - autotools build force-sets _WIN32_WINNT to 0x500, while also causing
 #   a compiler warning when overriding our value (which is a higher version).
 #   Builds are not supposed to set _WIN32_WINNT on their own, esp. not override
@@ -31,12 +32,12 @@ _VER="$1"
   (
     cd "${_BLDDIR}"
     python3 '../src/psl-make-dafsa' --output-format=cxx+ '../list/public_suffix_list.dat' 'suffixes_dafsa.h'
-    # shellcheck disable=SC2086
+    # shellcheck disable=SC2046,SC2086
     ${_CC_GLOBAL} ${_CFLAGS_GLOBAL} ${_CFLAGS_GLOBAL_AUTOTOOLS} ${_CPPFLAGS_GLOBAL} \
-      -DENABLE_BUILTIN -DHAVE_VISIBILITY=1 -DBUILDING_PSL \
-      -DPACKAGE_VERSION="\"${LIBPSL_VER_}\"" \
-      -I. -I../include -c ../src/*.c
-    "${AR}" rcs libpsl.a ./*.o
+      -DENABLE_BUILTIN -DPACKAGE_VERSION="\"${LIBPSL_VER_}\"" \
+      -I. -I../include -c $(find ../src -name '*.c' | sort)
+    # shellcheck disable=SC2046
+    "${AR}" rcs libpsl.a $(find . -name '*.o' | sort)
   )
 
   # Install manually