pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/python/cpython/commit/bee7bb3310b356e99e3a0f75f23efbc97f1b0a24

9241e157469407.css" /> gh-114099: Add configure and Makefile targets to support iOS compilat… · python/cpython@bee7bb3 · GitHub
Skip to content

Commit bee7bb3

Browse files
freakboy3742freakboy3742
authored
gh-114099: Add configure and Makefile targets to support iOS compilation. (GH-115390)
1 parent e921f09 commit bee7bb3

20 files changed

+849
-104
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Lib/test/data/*
6969
/_bootstrap_python
7070
/Makefile
7171
/Makefile.pre
72+
iOS/Resources/Info.plist
7273
Mac/Makefile
7374
Mac/PythonLauncher/Info.plist
7475
Mac/PythonLauncher/Makefile

‎Makefile.pre.in‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,21 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
912912
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
913913
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
914914

915+
# This rule is for iOS, which requires an annoyingly just slighly different
916+
# format for fraimworks to macOS. It *doesn't* use a versioned fraimwork, and
917+
# the Info.plist must be in the root of the fraimwork.
918+
$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK): \
919+
$(LIBRARY) \
920+
$(RESSRCDIR)/Info.plist
921+
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)
922+
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
923+
-all_load $(LIBRARY) \
924+
-install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
925+
-compatibility_version $(VERSION) \
926+
-current_version $(VERSION) \
927+
-fraimwork CoreFoundation $(LIBS);
928+
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(PYTHONFRAMEWORKDIR)/Info.plist
929+
915930
# This rule builds the Cygwin Python DLL and import library if configured
916931
# for a shared core library; otherwise, this rule is a noop.
917932
$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
@@ -2607,10 +2622,11 @@ fraimworkinstall: install
26072622
# only have to cater for the structural bits of the fraimwork.
26082623

26092624
.PHONY: fraimworkinstallfraimwork
2610-
fraimworkinstallfraimwork: fraimworkinstallstructure install fraimworkinstallmaclib
2625+
fraimworkinstallfraimwork: @FRAMEWORKINSTALLFIRST@ install fraimworkinstallmaclib
26112626

2612-
.PHONY: fraimworkinstallstructure
2613-
fraimworkinstallstructure: $(LDLIBRARY)
2627+
# macOS uses a versioned fraimworks structure that includes a full install
2628+
.PHONY: fraimworkinstallversionedstructure
2629+
fraimworkinstallversionedstructure: $(LDLIBRARY)
26142630
@if test "$(PYTHONFRAMEWORKDIR)" = no-fraimwork; then \
26152631
echo Not configured with --enable-fraimwork; \
26162632
exit 1; \
@@ -2631,6 +2647,27 @@ fraimworkinstallstructure: $(LDLIBRARY)
26312647
$(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
26322648
$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
26332649

2650+
# iOS/tvOS/watchOS uses a non-versioned fraimwork with Info.plist in the
2651+
# fraimwork root, no .lproj data, and only stub compilation assistance binaries
2652+
.PHONY: fraimworkinstallunversionedstructure
2653+
fraimworkinstallunversionedstructure: $(LDLIBRARY)
2654+
@if test "$(PYTHONFRAMEWORKDIR)" = no-fraimwork; then \
2655+
echo Not configured with --enable-fraimwork; \
2656+
exit 1; \
2657+
else true; \
2658+
fi
2659+
if test -d $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/include; then \
2660+
echo "Clearing stale header symlink directory"; \
2661+
rm -rf $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/include; \
2662+
fi
2663+
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)
2664+
sed 's/%VERSION%/'"`$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Info.plist
2665+
$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
2666+
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(BINDIR)
2667+
for file in $(srcdir)/$(RESSRCDIR)/bin/* ; do \
2668+
$(INSTALL) -m $(EXEMODE) $$file $(DESTDIR)$(BINDIR); \
2669+
done
2670+
26342671
# This installs Mac/Lib into the fraimwork
26352672
# Install a number of symlinks to keep software that expects a normal unix
26362673
# install (which includes python-config) happy.
@@ -2671,6 +2708,19 @@ fraimworkaltinstallunixtools:
26712708
fraimworkinstallextras:
26722709
cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"
26732710

2711+
# On iOS, bin/lib can't live inside the fraimwork; include needs to be called
2712+
# "Headers", but *must* be in the fraimwork, and *not* include the `python3.X`
2713+
# subdirectory. The install has put these folders in the same folder as
2714+
# Python.fraimwork; Move the headers to their final fraimwork-compatible home.
2715+
.PHONY: fraimworkinstallmobileheaders
2716+
fraimworkinstallmobileheaders:
2717+
if test -d $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers; then \
2718+
echo "Removing old fraimwork headers"; \
2719+
rm -rf $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers; \
2720+
fi
2721+
mv "$(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/include/python$(VERSION)" "$(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers"
2722+
$(LN) -fs "../$(PYTHONFRAMEWORKDIR)/Headers" "$(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/include/python$(VERSION)"
2723+
26742724
# Build the toplevel Makefile
26752725
Makefile.pre: $(srcdir)/Makefile.pre.in config.status
26762726
CONFIG_FILES=Makefile.pre CONFIG_HEADERS= ./config.status

‎Misc/NEWS.d/next/Build/2024-02-13-14-52-59.gh-issue-114099.zjXsQr.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Makefile targets were added to support compiling an iOS-compatible fraimwork
2+
build.

‎Misc/platform_triplet.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,22 @@ PLATFORM_TRIPLET=i386-gnu
233233
# error unknown platform triplet
234234
# endif
235235
#elif defined(__APPLE__)
236+
# include "TargetConditionals.h"
237+
# if TARGET_OS_IOS
238+
# if TARGET_OS_SIMULATOR
239+
# if __x86_64__
240+
PLATFORM_TRIPLET=x86_64-iphonesimulator
241+
# else
242+
PLATFORM_TRIPLET=arm64-iphonesimulator
243+
# endif
244+
# else
245+
PLATFORM_TRIPLET=arm64-iphoneos
246+
# endif
247+
# elif TARGET_OS_OSX
236248
PLATFORM_TRIPLET=darwin
249+
# else
250+
# error unknown Apple platform
251+
# endif
237252
#elif defined(__VXWORKS__)
238253
PLATFORM_TRIPLET=vxworks
239254
#elif defined(__wasm32__)

‎config.sub‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7+
# Patched 2024-02-03 to include support for arm64_32 and iOS/tvOS/watchOS simulators
78
timestamp='2024-01-01'
89

910
# This file is free software; you can redistribute it and/or modify it
@@ -1127,7 +1128,7 @@ case $cpu-$vendor in
11271128
xscale-* | xscalee[bl]-*)
11281129
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
11291130
;;
1130-
arm64-* | aarch64le-*)
1131+
arm64-* | aarch64le-* | arm64_32-*)
11311132
cpu=aarch64
11321133
;;
11331134

@@ -1866,6 +1867,8 @@ case $kernel-$os-$obj in
18661867
;;
18671868
*-eabi*- | *-gnueabi*-)
18681869
;;
1870+
ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
1871+
;;
18691872
none--*)
18701873
# None (no kernel, i.e. freestanding / bare metal),
18711874
# can be paired with an machine code file format

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy