From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 29 Apr 2026 13:06:09 +0000 (+0200)
Subject: - Fix windows 64bit build for libssp dependency.
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=62e8db1c6a08e6e2eab8d374373d3cca3da80eb5;p=thirdparty%2Funbound.git

- Fix windows 64bit build for libssp dependency.
---

diff --git a/doc/Changelog b/doc/Changelog
index f90010638..8c99aceaf 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 29 April 2026: Wouter
 	- tag for 1.25.0. The code repository continues with 1.25.1 in
 	  development.
+	- Fix windows 64bit build for libssp dependency.
 
 23 April 2026: Wouter
 	- Merge #1441: Fix buffer overrun in
diff --git a/makedist.sh b/makedist.sh
index ca2a88b44..ec9021c2c 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -466,9 +466,13 @@ if [ "$DOWIN" = "yes" ]; then
 		|| error_cleanup "Could not configure"
 		set +x
     else
+		# Add -l:libssp:a to statically link libssp if possible.
+		# Put it at the end of LIBS, to satisfy also linked in
+		# dependencies.
 		set -x
 		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag \
 		|| error_cleanup "Could not configure"
+		sed -i Makefile -e 's/^\(LIBS=.*\)$/\1 -l:libssp.a/'
 		set +x
     fi
     info "Calling make"
@@ -485,6 +489,7 @@ if [ "$DOWIN" = "yes" ]; then
 		|| error_cleanup "Could not configure"
 		set +x
     else
+		# Do not add -l:libssp:a statically because it is a shared build.
 		set -x
 		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
 		|| error_cleanup "Could not configure"