- makedist.sh picks up 32bit libssp-0.dll when 32bit compile.

diff --git a/doc/Changelog b/doc/Changelog
index 66de221ed32d62a7729ddf2e753aedebeca65c9a..77ad26205ec07414b31e49fe20aeada2056eda37 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 June 2022: Wouter
+       - makedist.sh picks up 32bit libssp-0.dll when 32bit compile.
+
 27 May 2022: Wouter
        - Fix #684: [FTBS] configure script error with libmnl on openSUSE 15.3 (and possibly other distributions)
        - Version is set to 1.16.0 for release. Release tag 1.16.0rc1. This

diff --git a/makedist.sh b/makedist.sh
index 4234a0672d1ba1bff3f2067788f355ee0d07a412..7fb69630ee4a082c85181c8be04d23a7f8dc31d4 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -268,10 +268,12 @@ if [ "$DOWIN" = "yes" ]; then
                # before 1.0.1i need --cross-compile-prefix=i686-w64-mingw32-
                if test "$mw64" = "mingw64"; then
                        sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw64"
+                       sspdll="/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll"
                else
                        sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
+                       sspdll="/usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll"
                fi
-               if test -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
+               if test -f "$sspdll"; then
                        # stack protector lib needs to link in to make
                        # -lws2_32 work in openssl link stage
                        SSPLIB="-l:libssp.a"
@@ -439,8 +441,8 @@ if [ "$DOWIN" = "yes" ]; then
        cp ../../sslsharedinstall/lib64/libssl.dll.a libunbound/.
     fi
     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/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
-    if test -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
-           cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+    if test -f "$sspdll"; then
+           cp "$sspdll" libunbound/.
     fi
     # zipfile
     zip -r ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf root.key unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog libunbound