Skip to content

Commit 537c677

Browse files
committed
Remove more iOS/tvOS/watchOS stuff
1 parent f9aec9f commit 537c677

File tree

7 files changed

+2
-96
lines changed

7 files changed

+2
-96
lines changed

cpython-unix/build-cpython.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ if [ -n "${CROSS_COMPILING}" ]; then
8585
fi
8686
fi
8787

88-
patch -p1 -i ${ROOT}/patch-xopen-source-ios.patch
89-
9088
# LIBTOOL_CRUFT is unused and breaks cross-compiling on macOS. Nuke it.
9189
# Submitted upstream at https://github.com/python/cpython/pull/101048.
9290
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then

cpython-unix/extension-modules.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ _sqlite3:
521521
includes:
522522
- Modules/_sqlite
523523
defines-conditional:
524-
# Require dynamic binaries to load extensions. Cannot load on iOS.
524+
# Require dynamic binaries to load extensions.
525525
# 3.11+ uses opt in. <3.11 uses opt out.
526526
- define: PY_SQLITE_ENABLE_LOAD_EXTENSION=1
527527
targets:
@@ -530,9 +530,6 @@ _sqlite3:
530530
# linked. But this would break verification code. So enabled for
531531
# backwards compatibility.
532532
- .*-unknown-linux-.*
533-
- define: SQLITE_OMIT_LOAD_EXTENSION=1
534-
targets:
535-
- .*-ios
536533
links:
537534
- sqlite3
538535

cpython-unix/patch-apple-cross-3.12.patch

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,3 @@ index c62a565eb6..7e5d34632c 100644
4646
# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
4747
# disable features if it is defined, without any means to access these
4848
# features as extensions. For these systems, we skip the definition of
49-
@@ -1507,7 +1546,7 @@ if test $enable_shared = "yes"; then
50-
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
51-
RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
52-
;;
53-
- Darwin*)
54-
+ Darwin*|iOS*|tvOS*|watchOS*)
55-
LDLIBRARY='libpython$(LDVERSION).dylib'
56-
BLDLIBRARY='-L. -lpython$(LDVERSION)'
57-
RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
58-
@@ -3173,6 +3203,11 @@ then
59-
Linux*|GNU*|QNX*|VxWorks*|Haiku*)
60-
LDSHARED='$(CC) -shared'
61-
LDCXXSHARED='$(CXX) -shared';;
62-
+ iOS*|tvOS*|watchOS*)
63-
+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
64-
+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
65-
+ BLDSHARED="$LDSHARED"
66-
+ ;;
67-
FreeBSD*)
68-
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
69-
then

cpython-unix/patch-apple-cross-3.13.patch

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,3 @@ index 58f54076ff2..a734260691a 100644
5555
# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
5656
# disable features if it is defined, without any means to access these
5757
# features as extensions. For these systems, we skip the definition of
58-
@@ -1582,7 +1623,7 @@ if test $enable_shared = "yes"; then
59-
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
60-
RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
61-
;;
62-
- Darwin*)
63-
+ Darwin*|iOS*|tvOS*|watchOS*)
64-
LDLIBRARY='libpython$(LDVERSION).dylib'
65-
BLDLIBRARY='-L. -lpython$(LDVERSION)'
66-
RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
67-
@@ -3469,6 +3510,11 @@ then
68-
Linux*|GNU*|QNX*|VxWorks*|Haiku*)
69-
LDSHARED='$(CC) -shared'
70-
LDCXXSHARED='$(CXX) -shared';;
71-
+ iOS*|tvOS*|watchOS*)
72-
+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
73-
+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
74-
+ BLDSHARED="$LDSHARED"
75-
+ ;;
76-
FreeBSD*)
77-
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
78-
then

cpython-unix/patch-apple-cross.patch

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,3 @@ index c62a565eb6..7e5d34632c 100644
4646
# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
4747
# disable features if it is defined, without any means to access these
4848
# features as extensions. For these systems, we skip the definition of
49-
@@ -1507,7 +1546,7 @@ if test $enable_shared = "yes"; then
50-
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
51-
RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
52-
;;
53-
- Darwin*)
54-
+ Darwin*|iOS*|tvOS*|watchOS*)
55-
LDLIBRARY='libpython$(LDVERSION).dylib'
56-
BLDLIBRARY='-L. -lpython$(LDVERSION)'
57-
RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
58-
@@ -3173,6 +3203,11 @@ then
59-
Linux*|GNU*|QNX*|VxWorks*|Haiku*)
60-
LDSHARED='$(CC) -shared'
61-
LDCXXSHARED='$(CXX) -shared';;
62-
+ iOS*|tvOS*|watchOS*)
63-
+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
64-
+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
65-
+ BLDSHARED="$LDSHARED"
66-
+ ;;
67-
FreeBSD*)
68-
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
69-
then

cpython-unix/patch-xopen-source-ios.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/status.rst

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Project Status
55
==============
66

77
There is support for producing CPython distributions for Windows,
8-
macOS, Linux, and iOS. All distributions are highly self-contained and have
8+
macOS, and Linux. All distributions are highly self-contained and have
99
limited shared library dependencies.
1010

1111
Planned and features include:
@@ -19,15 +19,6 @@ Planned and features include:
1919
Target Notes
2020
============
2121

22-
Non-Darwin Apple Targets
23-
------------------------
24-
25-
Apple targets that aren't Darwin/macOS (iOS, tvOS, watchOS, and corresponding
26-
simulators) are considered alpha quality. The builds may or may not work. The
27-
builds haven't been widely tested.
28-
29-
Only Python 3.9 is currently supported.
30-
3122
Non-x86 Linux Targets
3223
---------------------
3324

0 commit comments

Comments
 (0)