Skip to content

Commit ed0df13

Browse files
committed
Update patch of v3.11.5
Includes: * XZ 5.4.4 * OpenSSL 3.1.2 * LibFFI 3.4.4 plus fixes to the build system to avoid lockups due to cross-compilation autodetection issues on iOS.
1 parent 07c51cd commit ed0df13

File tree

4 files changed

+261
-94
lines changed

4 files changed

+261
-94
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ BUILD_NUMBER=custom
3939
# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
4040
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
4141
# PYTHON_VER is the major/minor version (e.g., 3.10)
42-
PYTHON_VERSION=3.11.3
42+
PYTHON_VERSION=3.11.5
4343
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
4444
PYTHON_VER=$(basename $(PYTHON_VERSION))
4545

4646
BZIP2_VERSION=1.0.8
4747

48-
XZ_VERSION=5.4.2
48+
XZ_VERSION=5.4.4
4949

5050
# Preference is to use OpenSSL 3; however, Cryptography 3.4.8 (and
5151
# probably some other packages as well) only works with 1.1.1, so
5252
# we need to preserve the ability to build the older OpenSSL (for now...)
53-
OPENSSL_VERSION=3.1.0
53+
OPENSSL_VERSION=3.1.2
5454
# OPENSSL_VERSION_NUMBER=1.1.1
55-
# OPENSSL_REVISION=q
55+
# OPENSSL_REVISION=v
5656
# OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
5757

58-
LIBFFI_VERSION=3.4.2
58+
LIBFFI_VERSION=3.4.4
5959

6060
# Supported OS and dependencies
6161
DEPENDENCIES=BZip2 XZ OpenSSL libFFI
@@ -310,6 +310,7 @@ $$(XZ_SRCDIR-$(target))/Makefile: downloads/xz-$(XZ_VERSION).tar.gz
310310
--disable-shared \
311311
--enable-static \
312312
--host=$$(TARGET_TRIPLE-$(target)) \
313+
--build=$(HOST_ARCH)-apple-darwin \
313314
--prefix="$$(XZ_INSTALL-$(target))" \
314315
2>&1 | tee -a ../xz-$(XZ_VERSION).config.log
315316

0 commit comments

Comments
 (0)