Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cpython-unix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,6 @@ PYTHON_HOST_DEPENDS := \
$(OUTDIR)/m4-$(M4_VERSION)-$(PACKAGE_SUFFIX).tar \
$(NULL)

$(OUTDIR)/cpython-3.8-$(CPYTHON_3.8_VERSION)-$(HOST_PLATFORM).tar: $(PYTHON_HOST_DEPENDS)
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.8-host

$(OUTDIR)/cpython-3.9-$(CPYTHON_3.9_VERSION)-$(HOST_PLATFORM).tar: $(PYTHON_HOST_DEPENDS)
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.9-host

Expand Down Expand Up @@ -306,9 +303,6 @@ ALL_PYTHON_DEPENDS = \
$(PYTHON_DEPENDS) \
$(NULL)

$(OUTDIR)/cpython-$(CPYTHON_3.8_VERSION)-$(PACKAGE_SUFFIX).tar: $(ALL_PYTHON_DEPENDS)
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.8

$(OUTDIR)/cpython-$(CPYTHON_3.9_VERSION)-$(PACKAGE_SUFFIX).tar: $(ALL_PYTHON_DEPENDS)
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.9

Expand Down
4 changes: 1 addition & 3 deletions cpython-unix/build-cpython-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ pushd "Python-${PYTHON_VERSION}"
if [ "${CC}" = "clang" ]; then
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
else
patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
fi
elif [ "${CC}" = "musl-clang" ]; then
# Similarly, this is a problem for musl Clang on Python 3.13+
Expand Down
17 changes: 4 additions & 13 deletions cpython-unix/build-cpython.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ fi
if [ "${CC}" = "clang" ]; then
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
else
patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
fi
elif [ "${CC}" = "musl-clang" ]; then
# Similarly, this is a problem for musl Clang on Python 3.13+
Expand Down Expand Up @@ -164,9 +162,7 @@ fi
# executable. This behavior is kinda suspect on all platforms, as it could be adding
# library dependencies that shouldn't need to be there.
if [ "${PYBUILD_PLATFORM}" = "macos" ]; then
if [ "${PYTHON_MAJMIN_VERSION}" = "3.8" ]; then
patch -p1 -i ${ROOT}/patch-python-link-modules-3.8.patch
elif [ "${PYTHON_MAJMIN_VERSION}" = "3.9" ]; then
if [ "${PYTHON_MAJMIN_VERSION}" = "3.9" ]; then
patch -p1 -i ${ROOT}/patch-python-link-modules-3.9.patch
elif [ "${PYTHON_MAJMIN_VERSION}" = "3.10" ]; then
patch -p1 -i ${ROOT}/patch-python-link-modules-3.10.patch
Expand Down Expand Up @@ -210,7 +206,7 @@ fi

# iOS doesn't have system(). Teach posixmodule.c about that.
# Python 3.11 makes this a configure time check, so we don't need the patch there.
if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" && -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_10}" ]]; then
if [[ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_10}" ]]; then
patch -p1 -i ${ROOT}/patch-posixmodule-remove-system.patch
fi

Expand Down Expand Up @@ -393,11 +389,6 @@ if [ "${PYBUILD_PLATFORM}" = "macos" ]; then
# However CPython lacks the runtime availability guards for most symbols.
# This results in runtime failures when attempting to resolve/call the
# symbol.
#
# Unfortunately, this means we need to ban weak symbols on CPython 3.8, to
# the detriment of performance. However, we can actually use most symbols
# on aarch64 because it targets macOS SDK 11.0, not 10.9. But more modern
# symbols do need to be banned.
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_9}" ]; then
if [ "${TARGET_TRIPLE}" != "aarch64-apple-darwin" ]; then
for symbol in clock_getres clock_gettime clock_settime faccessat fchmodat fchownat fdopendir fstatat futimens getentropy linkat mkdirat openat preadv pwritev readlinkat renameat symlinkat unlinkat utimensat; do
Expand Down Expand Up @@ -907,7 +898,7 @@ done
mkdir ${ROOT}/out/python/build/lib
cp -av ${TOOLS_PATH}/deps/lib/*.a ${ROOT}/out/python/build/lib/

# On Apple, Python 3.9+ uses __builtin_available() to sniff for feature
# On Apple, Python uses __builtin_available() to sniff for feature
# availability. This symbol is defined by clang_rt, which isn't linked
# by default. When building a static library, one must explicitly link
# against clang_rt or you will get an undefined symbol error for
Expand Down
1 change: 0 additions & 1 deletion cpython-unix/build-main.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def main():
parser.add_argument(
"--python",
choices={
"cpython-3.8",
"cpython-3.9",
"cpython-3.10",
"cpython-3.11",
Expand Down
6 changes: 2 additions & 4 deletions cpython-unix/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,6 @@ def build_cpython_host(
"build-cpython-host.sh",
"patch-disable-multiarch.patch",
"patch-disable-multiarch-13.patch",
"patch-disable-multiarch-legacy.patch",
}
for s in sorted(support):
build_env.copy_file(SUPPORT / s)
Expand All @@ -456,7 +455,7 @@ def build_cpython_host(

# Set environment variables allowing convenient testing for Python
# version ranges.
for v in ("3.8", "3.9", "3.10", "3.11", "3.12", "3.13"):
for v in ("3.9", "3.10", "3.11", "3.12", "3.13"):
normal_version = v.replace(".", "_")

if meets_python_minimum_version(python_version, v):
Expand Down Expand Up @@ -785,7 +784,7 @@ def build_cpython(

# Set environment variables allowing convenient testing for Python
# version ranges.
for v in ("3.8", "3.9", "3.10", "3.11", "3.12", "3.13"):
for v in ("3.9", "3.10", "3.11", "3.12", "3.13"):
normal_version = v.replace(".", "_")

if meets_python_minimum_version(python_version, v):
Expand Down Expand Up @@ -1202,7 +1201,6 @@ def main():
)

elif action in (
"cpython-3.8",
"cpython-3.9",
"cpython-3.10",
"cpython-3.11",
Expand Down
15 changes: 0 additions & 15 deletions cpython-unix/patch-disable-multiarch-legacy.patch

This file was deleted.

12 changes: 0 additions & 12 deletions cpython-unix/patch-python-link-modules-3.8.patch

This file was deleted.

12 changes: 0 additions & 12 deletions cpython-unix/targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ aarch64-apple-darwin:
host_platforms:
- macos
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -149,7 +148,6 @@ aarch64-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -307,7 +305,6 @@ i686-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -552,7 +549,6 @@ x86_64-apple-darwin:
host_platforms:
- macos
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -722,7 +718,6 @@ x86_64-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -767,7 +762,6 @@ x86_64_v2-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -813,7 +807,6 @@ x86_64_v3-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -859,7 +852,6 @@ x86_64_v4-unknown-linux-gnu:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -905,7 +897,6 @@ x86_64-unknown-linux-musl:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -948,7 +939,6 @@ x86_64_v2-unknown-linux-musl:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -992,7 +982,6 @@ x86_64_v3-unknown-linux-musl:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -1036,7 +1025,6 @@ x86_64_v4-unknown-linux-musl:
host_platforms:
- linux64
pythons_supported:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down
Loading