Skip to content

Commit ac6e409

Browse files
johnzhou721johnzhou721
committed
Apple, could you please use one name for each product?
1 parent 42b1743 commit ac6e409

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# - iOS - build everything for iOS
55
# - tvOS - build everything for tvOS
66
# - watchOS - build everything for watchOS
7-
# - xrOS - build everything for xrOS
7+
# - visionOS - build everything for visionOS
88
# - BZip2 - build BZip2 for all platforms
99
# - BZip2-iOS - build BZip2 for iOS
1010
# - BZip2-tvOS - build BZip2 for tvOS
1111
# - BZip2-watchOS - build BZip2 for watchOS
12-
# - BZip2-xrOS - build BZip2 for xrOS
12+
# - BZip2-visionOS - build BZip2 for visionOS
1313
# - XZ - build XZ for all platforms
1414
# - XZ-iOS - build XZ for iOS
1515
# - XZ-tvOS - build XZ for tvOS
@@ -19,23 +19,23 @@
1919
# - OpenSSL-iOS - build OpenSSL for iOS
2020
# - OpenSSL-tvOS - build OpenSSL for tvOS
2121
# - OpenSSL-watchOS - build OpenSSL for watchOS
22-
# - OpenSSL-xrOS - build OpenSSL for xrOS
22+
# - OpenSSL-visionOS- build OpenSSL for visionOS
2323
# - mpdecimal - build mpdecimal for all platforms
2424
# - mpdecimal-iOS - build mpdecimal for iOS
2525
# - mpdecimal-tvOS - build mpdecimal for tvOS
2626
# - mpdecimal-watchOS - build mpdecimal for watchOS
27-
# - mpdecimal-xrOS - build mpdecimal for xrOS
27+
# - mpdecimal-visionOS- build mpdecimal for visionOS
2828
# - libFFI-iOS - build libFFI for iOS
2929
# - libFFI-tvOS - build libFFI for tvOS
3030
# - libFFI-watchOS - build libFFI for watchOS
31-
# - libFFI-xrOS - build libFFI for xrOS
31+
# - libFFI-visionOS - build libFFI for visionOS
3232

3333
# Current directory
3434
PROJECT_DIR=$(shell pwd)
3535

3636
# Supported OS and products
3737
PRODUCTS=BZip2 XZ OpenSSL libFFI
38-
OS_LIST=iOS tvOS watchOS xrOS
38+
OS_LIST=iOS tvOS watchOS visionOS
3939

4040
# The versions to compile by default.
4141
# In practice, these should be
@@ -79,10 +79,10 @@ VERSION_MIN-watchOS=4.0
7979
CFLAGS-watchOS=-mwatchos-version-min=$(VERSION_MIN-watchOS)
8080
PYTHON_CONFIGURE-watchOS=ac_cv_func_sigaltstack=no
8181

82-
# xrOS targets
83-
TARGETS-xrOS=xrsimulator.arm64 xros.arm64
84-
VERSION_MIN-xrOS=2.0
85-
# I don't know the version-min flag for xros, seems to work fine without it
82+
# visionOS targets
83+
TARGETS-visionOS=xrsimulator.arm64 xros.arm64
84+
VERSION_MIN-visionOS=2.0
85+
# Apple made lives harder by NOT having a -version-min flag
8686
PYTHON_CONFIGURE-xrOS=ac_cv_func_sigaltstack=no
8787

8888
# The architecture of the machine doing the build

‎patch/libffi.patch‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ diff -ur libffi-3.4.7 2/config.sub libffi-3.4.7/config.sub
66
| sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
77
| hiux* | abug | nacl* | netware* | windows* \
88
- | os9* | macos* | osx* | ios* | tvos* | watchos* \
9-
+ | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
9+
+ | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* | visionos* \
1010
| mpw* | magic* | mmixware* | mon960* | lnews* \
1111
| amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
1212
| aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -15,7 +15,7 @@ diff -ur libffi-3.4.7 2/config.sub libffi-3.4.7/config.sub
1515
os2-emx-)
1616
;;
1717
- ios*-simulator* | tvos*-simulator* | watchos*-simulator*)
18-
+ ios*-simulator* | tvos*-simulator* | watchos*-simulator* | xros*-simulator*)
18+
+ ios*-simulator* | tvos*-simulator* | watchos*-simulator* | xros*-simulator* | visionos*-simulator*)
1919
;;
2020
*-eabi*- | *-gnueabi*-)
2121
;;
@@ -27,16 +27,16 @@ diff -ur libffi-3.4.7 2/generate-darwin-source-and-headers.py libffi-3.4.7/gener
2727
arch = 'arm64_32'
2828
version_min = '-mwatchos-version-min=4.0'
2929
+
30-
+class xros_simulator_arm64_platform(arm64_platform):
31-
+ target = 'arm64-apple-xros-simulator'
32-
+ directory = 'darwin_xros'
30+
+class visionos_simulator_arm64_platform(arm64_platform):
31+
+ target = 'arm64-apple-visionos-simulator'
32+
+ directory = 'darwin_visionos'
3333
+ sdk = 'xrsimulator'
3434
+ version_min = ''
3535

3636

37-
+class xros_device_arm64_platform(arm64_platform):
38-
+ target = 'arm64-apple-xros'
39-
+ directory = 'darwin_xros'
37+
+class visionos_device_arm64_platform(arm64_platform):
38+
+ target = 'arm64-apple-visionos'
39+
+ directory = 'darwin_visionos'
4040
+ sdk = 'xros'
4141
+ arch = 'arm64'
4242
+ version_min = ''
@@ -49,46 +49,46 @@ diff -ur libffi-3.4.7 2/generate-darwin-source-and-headers.py libffi-3.4.7/gener
4949
generate_ios=True,
5050
generate_tvos=True,
5151
generate_watchos=True,
52-
+ generate_xros=True
52+
+ generate_visionos=True
5353
):
5454
copy_files('src', 'darwin_common/src', pattern='*.c')
5555
copy_files('include', 'darwin_common/include', pattern='*.h')
5656
@@ -266,6 +281,9 @@
5757
copy_src_platform_files(watchos_simulator_arm64_platform)
5858
copy_src_platform_files(watchos_device_armv7k_platform)
5959
copy_src_platform_files(watchos_device_arm64_32_platform)
60-
+ if generate_xros:
61-
+ copy_src_platform_files(xros_simulator_arm64_platform)
62-
+ copy_src_platform_files(xros_device_arm64_platform)
60+
+ if generate_visionos:
61+
+ copy_src_platform_files(visionos_simulator_arm64_platform)
62+
+ copy_src_platform_files(visionos_device_arm64_platform)
6363

6464
platform_headers = collections.defaultdict(set)
6565

6666
@@ -288,6 +306,9 @@
6767
build_target(watchos_simulator_arm64_platform, platform_headers)
6868
build_target(watchos_device_armv7k_platform, platform_headers)
6969
build_target(watchos_device_arm64_32_platform, platform_headers)
70-
+ if generate_xros:
71-
+ build_target(xros_simulator_arm64_platform, platform_headers)
72-
+ build_target(xros_device_arm64_platform, platform_headers)
70+
+ if generate_visionos:
71+
+ build_target(visionos_simulator_arm64_platform, platform_headers)
72+
+ build_target(visionos_device_arm64_platform, platform_headers)
7373

7474
mkdir_p('darwin_common/include')
7575
for header_name, tag_tuples in platform_headers.items():
7676
@@ -302,11 +323,13 @@
7777
parser.add_argument('--only-osx', action='store_true', default=False)
7878
parser.add_argument('--only-tvos', action='store_true', default=False)
7979
parser.add_argument('--only-watchos', action='store_true', default=False)
80-
+ parser.add_argument('--only-xros', action='store_true', default=False)
80+
+ parser.add_argument('--only-visionos', action='store_true', default=False)
8181
args = parser.parse_args()
8282

8383
generate_source_and_headers(
8484
- generate_osx=not args.only_ios and not args.only_tvos and not args.only_watchos,
8585
- generate_ios=not args.only_osx and not args.only_tvos and not args.only_watchos,
8686
- generate_tvos=not args.only_ios and not args.only_osx and not args.only_watchos,
8787
- generate_watchos=not args.only_ios and not args.only_osx and not args.only_tvos,
88-
+ generate_osx=not args.only_ios and not args.only_tvos and not args.only_watchos and not args.only_xros,
89-
+ generate_ios=not args.only_osx and not args.only_tvos and not args.only_watchos and not args.only_xros,
90-
+ generate_tvos=not args.only_ios and not args.only_osx and not args.only_watchos and not args.only_xros,
91-
+ generate_watchos=not args.only_ios and not args.only_osx and not args.only_tvos and not args.only_xros,
92-
+ generate_xros=not args.only_ios and not args.only_osx and not args.only_tvos and not args.only_watchos,
88+
+ generate_osx=not args.only_ios and not args.only_tvos and not args.only_watchos and not args.only_visionos,
89+
+ generate_ios=not args.only_osx and not args.only_tvos and not args.only_watchos and not args.only_visionos,
90+
+ generate_tvos=not args.only_ios and not args.only_osx and not args.only_watchos and not args.only_visionos,
91+
+ generate_watchos=not args.only_ios and not args.only_osx and not args.only_tvos and not args.only_visionos,
92+
+ generate_visionos=not args.only_ios and not args.only_osx and not args.only_tvos and not args.only_watchos,
9393
)
9494

‎patch/mpdecimal.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ diff -ur mpdecimal-4.0.0-orig/config.sub mpdecimal-4.0.0/config.sub
1313
@@ -1713,3 +1713,3 @@
1414
| hiux* | abug | nacl* | netware* | windows* \
1515
- | os9* | macos* | osx* | ios* | tvos* | watchos* \
16-
+ | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
16+
+ | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* | visionos* \
1717
| mpw* | magic* | mmixware* | mon960* | lnews* \
1818
@@ -1792,6 +1792,8 @@
1919
os2-emx)
2020
;;
2121
*-eabi* | *-gnueabi*)
2222
+ ;;
23-
+ ios*-simulator | tvos*-simulator | watchos*-simulator | xros*-simulator)
23+
+ ios*-simulator | tvos*-simulator | watchos*-simulator | xros*-simulator | visionos*-simulator)
2424
;;
2525
none-coff* | none-elf*)
2626
# None (no kernel, i.e. freestanding / bare metal),

‎patch/xz.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ diff -ru xz-5.4.7-orig/build-aux/config.sub xz-5.4.7/build-aux/config.sub
1212

1313
@@ -2150,2 +2150,3 @@
1414
| xray* \
15-
+ | xros* \
15+
+ | xros* | visionos* \
1616
| zephyr* \
1717
@@ -1865,6 +1865,8 @@
1818
os2-emx-)
1919
;;
2020
*-eabi*- | *-gnueabi*-)
2121
+ ;;
22-
+ ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator-)
22+
+ ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator- | visionos*-simulator- )
2323
;;
2424
none--*)
2525
# None (no kernel, i.e. freestanding / bare metal),

0 commit comments

Comments
 (0)