/
mobile-1.26.0.patch
187 lines (174 loc) · 7.76 KB
/
mobile-1.26.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
diff -ru numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/envconfig.py numpy-1.26.0/vendored-meson/meson/mesonbuild/envconfig.py
--- numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/envconfig.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson/mesonbuild/envconfig.py 2023-10-17 15:16:38
@@ -317,9 +317,33 @@
def is_darwin(self) -> bool:
"""
- Machine is Darwin (iOS/tvOS/OS X)?
+ Machine is a Darwin kernel (iOS/tvOS/macOS)?
"""
- return self.system in {'darwin', 'ios', 'tvos'}
+ return self.system in {'darwin', 'ios', 'tvos', 'watchos'}
+
+ def is_macOS(self) -> bool:
+ """
+ Machine is macOS?
+ """
+ return self.system == 'darwin'
+
+ def is_iOS(self) -> bool:
+ """
+ Machine is iOS?
+ """
+ return self.system == 'ios'
+
+ def is_tvOS(self) -> bool:
+ """
+ Machine is tvOS?
+ """
+ return self.system == 'tvos'
+
+ def is_watchOS(self) -> bool:
+ """
+ Machine is watchOS?
+ """
+ return self.system == 'watchos'
def is_android(self) -> bool:
"""
diff -ru numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/environment.py numpy-1.26.0/vendored-meson/meson/mesonbuild/environment.py
--- numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/environment.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson/mesonbuild/environment.py 2023-10-02 14:33:03
@@ -290,7 +290,7 @@
"""
if mesonlib.is_windows():
trial = detect_windows_arch(compilers)
- elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_qnx() or mesonlib.is_aix():
+ elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_qnx() or mesonlib.is_aix() or mesonlib.is_ios() or mesonlib.is_tvos() or mesonlib.is_watchos():
trial = platform.processor().lower()
else:
trial = platform.machine().lower()
@@ -356,7 +356,7 @@
def detect_cpu(compilers: CompilersDict) -> str:
if mesonlib.is_windows():
trial = detect_windows_arch(compilers)
- elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_aix():
+ elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_aix() or mesonlib.is_ios() or mesonlib.is_tvos() or mesonlib.is_watchos():
trial = platform.processor().lower()
else:
trial = platform.machine().lower()
diff -ru numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/linkers/detect.py numpy-1.26.0/vendored-meson/meson/mesonbuild/linkers/detect.py
--- numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/linkers/detect.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson/mesonbuild/linkers/detect.py 2023-10-17 15:18:33
@@ -199,7 +199,17 @@
break
else:
__failed_to_detect_linker(compiler, check_args, o, e)
- linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+
+ # iOS/tvOS/watchOS have different linking needs.
+ if (
+ env.machines[for_machine].is_iOS()
+ or env.machines[for_machine].is_tvOS()
+ or env.machines[for_machine].is_watchOS()
+ ):
+ linker = linkers.AppleMobileDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+ else:
+ linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+
elif 'GNU' in o or 'GNU' in e:
gnu_cls: T.Type[GnuDynamicLinker]
# this is always the only thing on stdout, except for swift
diff -ru numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/linkers/linkers.py numpy-1.26.0/vendored-meson/meson/mesonbuild/linkers/linkers.py
--- numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/linkers/linkers.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson/mesonbuild/linkers/linkers.py 2023-10-17 14:59:26
@@ -829,6 +829,12 @@
return ["-Wl,-cache_path_lto," + path]
+class AppleMobileDynamicLinker(AppleDynamicLinker):
+ # iOS/tvOS/watchOS need to be linked with -dynamiclib, not -bundle
+ def get_std_shared_module_args(self, options: "KeyedOptionDictType") -> T.List[str]:
+ return ["-dynamiclib"] + self._apply_prefix("-undefined,dynamic_lookup")
+
+
class LLVMLD64DynamicLinker(AppleDynamicLinker):
id = 'ld64.lld'
diff -ru numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/utils/universal.py numpy-1.26.0/vendored-meson/meson/mesonbuild/utils/universal.py
--- numpy-1.26.0-orig/vendored-meson/meson/mesonbuild/utils/universal.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson/mesonbuild/utils/universal.py 2023-10-02 13:52:21
@@ -133,6 +133,9 @@
'is_netbsd',
'is_openbsd',
'is_osx',
+ 'is_ios',
+ 'is_tvos',
+ 'is_watchos',
'is_qnx',
'is_sunos',
'is_windows',
@@ -626,6 +629,18 @@
def is_osx() -> bool:
return platform.system().lower() == 'darwin'
+
+
+def is_ios() -> bool:
+ return platform.system().lower() == 'ios'
+
+
+def is_tvos() -> bool:
+ return platform.system().lower() == 'tvos'
+
+
+def is_watchos() -> bool:
+ return platform.system().lower() == 'watchos'
def is_linux() -> bool:
diff -ru numpy-1.26.0-orig/vendored-meson/meson-python/mesonpy/__init__.py numpy-1.26.0/vendored-meson/meson-python/mesonpy/__init__.py
--- numpy-1.26.0-orig/vendored-meson/meson-python/mesonpy/__init__.py 1970-01-01 08:00:00
+++ numpy-1.26.0/vendored-meson/meson-python/mesonpy/__init__.py 2023-10-03 14:33:05
@@ -133,7 +133,7 @@
_SUFFIXES = importlib.machinery.all_suffixes()
_EXTENSION_SUFFIXES = importlib.machinery.EXTENSION_SUFFIXES
-_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll)$')
+_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll|dylib)$')
assert all(re.match(_EXTENSION_SUFFIX_REGEX, x) for x in _EXTENSION_SUFFIXES)
@@ -665,7 +665,8 @@
self._install_dir.mkdir(exist_ok=True, parents=True)
# setuptools-like ARCHFLAGS environment variable support
- if sysconfig.get_platform().startswith('macosx-'):
+ sysconfig_platform = sysconfig.get_platform()
+ if sysconfig_platform.startswith('macosx-'):
archflags = os.environ.get('ARCHFLAGS', '').strip()
if archflags:
arch, *other = filter(None, (x.strip() for x in archflags.split('-arch')))
@@ -689,6 +690,34 @@
''')
self._meson_cross_file.write_text(cross_file_data)
self._meson_args['setup'].extend(('--cross-file', os.fspath(self._meson_cross_file)))
+ elif sysconfig_platform.startswith("ios-"):
+ arch = sysconfig_platform.split("-")[-1]
+ family = "aarch64" if arch == "arm64" else arch
+ cross_file_data = textwrap.dedent(
+ f"""
+ [binaries]
+ c = [{sysconfig.get_config_var("CC")!r}]
+ cpp = [{sysconfig.get_config_var("CC")!r}]
+
+ [host_machine]
+ system = 'ios'
+ cpu = {arch!r}
+ cpu_family = {family!r}
+ endian = 'little'
+
+ [properties]
+ longdouble_format = 'IEEE_DOUBLE_LE'
+ """
+ )
+ self._meson_cross_file.write_text(cross_file_data)
+ self._meson_args["setup"].extend(
+ (
+ # Include the Meson cross-compilation file
+ "--cross-file", os.fspath(self._meson_cross_file),
+ # Disable BLAS
+ "-Dallow-noblas=true",
+ )
+ )
# load pyproject.toml
pyproject = tomllib.loads(self._source_dir.joinpath('pyproject.toml').read_text())