aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2024-07-01 14:57:03 +0000
committerWerner Koch <[email protected]>2024-07-01 14:59:38 +0000
commit5d3995b16bf27c77d0f1fde7e40bbe2aa70c58de (patch)
treecdcff3c2ccb503d973438d5480fb977257d625e0
parentUpdate NEWS (diff)
downloadgnupg-5d3995b16bf27c77d0f1fde7e40bbe2aa70c58de.tar.gz
gnupg-5d3995b16bf27c77d0f1fde7e40bbe2aa70c58de.zip
speedo,w32: Add extra flags for gpgrt and fix SO name of libassuan.
-- Due to the recently introduced use of STARTUPINFOEXW in gpgrt we now need at least Windows Vista. Version 8 of Mingw defaults to XP SP2 which requires us to explicit override that default. The SO number of libassuan needs an update too.
-rw-r--r--build-aux/speedo.mk2
-rw-r--r--build-aux/speedo/w32/inst.nsi4
2 files changed, 4 insertions, 2 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 39b2157e3..655480b63 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -516,6 +516,8 @@ speedo_pkg_npth_configure = --enable-static
speedo_pkg_libgpg_error_configure = --enable-static --enable-install-gpg-error-config
speedo_pkg_w64_libgpg_error_configure = --enable-static --enable-install-gpg-error-config
+speedo_pkg_libgpg_error_extracflags = -D_WIN32_WINNT=0x0600
+speedo_pkg_w64_libgpg_error_extracflags = -D_WIN32_WINNT=0x0600
speedo_pkg_libassuan_configure = --enable-static
speedo_pkg_w64_libassuan_configure = --enable-static
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 6c4b84969..ffe0350ef 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -820,7 +820,7 @@ SectionEnd
Section "-assuan" SEC_assuan
SetOutPath "$INSTDIR\bin"
- File bin/libassuan-0.dll
+ File bin/libassuan-9.dll
SetOutPath "$INSTDIR\lib"
File /oname=libassuan.imp lib/libassuan.dll.a
SetOutPath "$INSTDIR\include"
@@ -1231,7 +1231,7 @@ Section "-un.ksba"
SectionEnd
Section "-un.assuan"
- Delete "$INSTDIR\bin\libassuan-0.dll"
+ Delete "$INSTDIR\bin\libassuan-9.dll"
Delete "$INSTDIR\lib\libassuan.imp"
Delete "$INSTDIR\include\assuan.h"
SectionEnd