diff options
| author | Werner Koch <[email protected]> | 2024-08-12 15:11:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-08-12 15:11:58 +0000 |
| commit | 377d28e1dbf5525016f53463e1cdf8b855b0be5e (patch) | |
| tree | 9a60d5fe182d4a65e9087679a374d9efdeb4e91e | |
| parent | gpgconf: Print the full commit id. (diff) | |
| download | gnupg-377d28e1dbf5525016f53463e1cdf8b855b0be5e.tar.gz gnupg-377d28e1dbf5525016f53463e1cdf8b855b0be5e.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.
(cherry picked from commit d56b63a66181b4f029e91dcea095e9eb149895b7)
| -rw-r--r-- | build-aux/speedo.mk | 4 | ||||
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index e47dfe366..7d056063d 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -271,7 +271,7 @@ AUTHENTICODE_FILES= \ gpgsm.exe \ gpgtar.exe \ gpgv.exe \ - libassuan-0.dll \ + libassuan-9.dll \ libgcrypt-20.dll \ libgpg-error-0.dll \ libgpgme-11.dll \ @@ -594,6 +594,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 cbf2d10af..24b62c5fa 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -811,7 +811,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" @@ -1223,7 +1223,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 |