configure.ac | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 2954d2df372514cc5c5da08dc883a144856dd5a1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Mar 14 21:36:55 2025 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Mar 27 10:21:27 2025 +0100
windows arm64 requires SDK 10.0.22000 or newer for clang (skia)
since the windows headers themselves use intrinsics that are not
available when using clang. Newer SDK solves that problem.
(adjusted to the branch for not using pdfium that uses clang)
Change-Id: I0fa8cb05650b7cf87c38f8859bd1d0fc4f10c7ad
(cherry picked from commit 821a78abc4a472106b1395a6229985ac5cf5a597)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182998
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 5682b6240a07..19a3a6c4d2b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7174,9 +7174,18 @@ if test "$_os" = "WINNT"; then
echo $WINDOWS_SDK_LIB_SUBDIR
# Assuming maximum of 5 digits for each part and ignoring last part
SDK_NORMALIZED_VER=$(echo $WINDOWS_SDK_LIB_SUBDIR | awk -F.
'{printf("%d%05d%05d
", $1, $2, $3)}')
- # 10.0.20348.0 is the minimum required version
- if test "$SDK_NORMALIZED_VER" -lt 100000020348; then
- AC_MSG_ERROR([You need Windows SDK greater than or equal
10.0.20348.0])
+ if test "$SDK_NORMALIZED_VER" -lt 100000022000; then
+ if test "$WIN_HOST_ARCH" = "arm64" -a "$enable_skia" != "no"; then
+ AC_MSG_ERROR([You need Windows SDK 10.0.22000 or later to
build for Windows arm64 with skia. Install a newer version of the SDK or
disable skia])
+ fi
+ # 10.0.20348.0 is the minimum required version,
+ # but it makes sense to align with arm64 baseline.
+ # Give people a heads-up to update their systems before enforcing
it
+ if test "$SDK_NORMALIZED_VER" -lt 100000020348; then
+ AC_MSG_ERROR([You need Windows SDK greater than or equal
10.0.20348.0])
+ else
+ add_warning "build requirements might be bumped to Windows SDK
>= 10.0.22000 soon"
+ fi
fi
fi
