configure.ac | 15 ++++++++++++---
external/python3/ExternalPackage_python3.mk | 12 ++----------
2 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit 9b0668b6c57ee8a5fce0266df4fce0b73a78873b
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Mar 27 10:04:53 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Mar 27 11:11:39 2025 +0100
python3: simplify code in makefile
Mac never executes this code. See
$(if $(filter
MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3)
in external/python3/Module_python3.mk
Change-Id: I928f480945279f13f8ff3c398ddbbed133b9d9ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183369
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index 984e925bf102..720781a7a593 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -137,14 +137,6 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
-ifeq ($(OS),LINUX)
-python3_MACHDEP=linux
-else
-ifeq ($(OS),MACOSX)
-python3_MACHDEP=darwin
-endif
-endif
-
# that one is generated...
ifeq ($(HOST_PLATFORM),powerpc64le-unknown-linux-gnu)
$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
@@ -161,11 +153,11 @@ else
ifneq ($(OS),WNT)
ifeq ($(CPUNAME),ARM)
$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
- LO_lib/_sysconfigdata_$(if
$(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst
v7l-unknown,,$(HOST_PLATFORM))).py \
+ LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_linux_$(subst
i686,i386,$(subst v7l-unknown,,$(HOST_PLATFORM))).py \
))
else
$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
- LO_lib/_sysconfigdata_$(if
$(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst
-pc,,$(HOST_PLATFORM))).py \
+ LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_linux_$(subst
i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
))
endif
endif
commit 177189b17dd2ba1e6ecdb0736a744cb6c31a40d6
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Mar 14 21:36:55 2025 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Mar 27 11:11:31 2025 +0100
windows arm64 requires SDK 10.0.22000 or newer for clang (skia,pdfium)
since the windows headers themselves use intrinsics that are not
available when using clang. Newer SDK solves that problem.
Change-Id: I0fa8cb05650b7cf87c38f8859bd1d0fc4f10c7ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182933
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index d35b53fabe9f..a621acb24aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7193,9 +7193,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" -o
"$enable_pdfium" != "no" \) ; then
+ AC_MSG_ERROR([You need Windows SDK 10.0.22000 or later to
build for Windows arm64 with skia or pdfium. Install a newer version of the SDK
or disable skia and pdfium])
+ 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
