From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 30 Mar 2021 20:15:12 +0000 (+0200)
Subject: - Disable the use of stack-protector for cross compiled 32-bit windows builds;
X-Git-Tag: release-1.13.2rc1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d54b2cdef5fc5f512e6a4ae9dec86441b669818;p=thirdparty%2Funbound.git

- Disable the use of stack-protector for cross compiled 32-bit windows builds;
  relates to #444.
---

diff --git a/doc/Changelog b/doc/Changelog
index d5412a2a0..e652f3f6d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+30 March 2021: George
+	- Disable the use of stack-protector for cross compiled 32-bit windows
+	  builds; relates to #444.
+
 25 March 2021: Wouter
 	- Fix #429: Also fix end of transfer for http download of auth zones.
 
diff --git a/makedist.sh b/makedist.sh
index 25cabe136..df44a97a8 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -371,7 +371,12 @@ if [ "$DOWIN" = "yes" ]; then
 	|| error_cleanup "Could not configure"
     fi
     info "Calling make"
-    make $MINJ || error_cleanup "Could not make"
+	# Disable stack-protector for 32-bit windows builds.
+	if test "$W64" = "no"; then
+		make $MINJ CFLAGS='-fno-stack-protector' || error_cleanup "Could not make"
+	else
+		make $MINJ || error_cleanup "Could not make"
+	fi
     info "Make complete"
 
     if test "`uname`" = "Linux"; then 
@@ -386,7 +391,12 @@ if [ "$DOWIN" = "yes" ]; then
 	|| error_cleanup "Could not configure"
     fi
     info "Calling make for DLL"
-    make $MINJ || error_cleanup "Could not make DLL"
+	# Disable stack-protector for 32-bit windows builds.
+	if test "$W64" = "no"; then
+		make $MINJ CFLAGS='-fno-stack-protector' || error_cleanup "Could not make DLL"
+	else
+		make $MINJ || error_cleanup "Could not make DLL"
+	fi
     info "Make DLL complete"
     cd ../unbound
     fi
@@ -413,7 +423,9 @@ if [ "$DOWIN" = "yes" ]; then
     mkdir libunbound
     cp ../../unbound_shared/unbound.h ../../unbound_shared/.libs/libunbound*.dll ../../unbound_shared/.libs/libunbound.dll.a ../../unbound_shared/.libs/libunbound.a ../../unbound_shared/.libs/libunbound*.def ../../sslsharedinstall/lib/libcrypto.dll.a ../../sslsharedinstall/lib/libssl.dll.a ../../sslsharedinstall/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
     if test "$W64" = "no"; then
-	    cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+	# Disable stack-protector for 32-bit windows builds.
+	# cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+	:
     else
 	    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
     fi