File tree 3 files changed +19
-1
lines changed
3 files changed +19
-1
lines changed Original file line number Diff line number Diff line change @@ -120,7 +120,7 @@ if [ "${CC}" = "clang" ]; then
120
120
elif [ " ${CC} " = " musl-clang" ]; then
121
121
# This appears to also be a problem for musl builds on 3.13.
122
122
if [ -n " ${PYTHON_MEETS_MINIMUM_VERSION_3_13} " ]; then
123
- patch -p1 -i ${ROOT} /patch-disable -multiarch-13.patch
123
+ patch -p1 -i ${ROOT} /patch-musl -multiarch-13.patch
124
124
fi
125
125
fi
126
126
Original file line number Diff line number Diff line change @@ -436,6 +436,7 @@ def build_cpython_host(
436
436
"build-cpython-host.sh" ,
437
437
"patch-disable-multiarch.patch" ,
438
438
"patch-disable-multiarch-13.patch" ,
439
+ "patch-musl-multiarch-13.patch" ,
439
440
"patch-disable-multiarch-legacy.patch" ,
440
441
}
441
442
for s in sorted (support ):
Original file line number Diff line number Diff line change
1
+ diff -u 13-a/configure.ac 13-b/configure.ac
2
+ --- 13-a/configure.ac 2024-05-08 05:21:00.000000000 -0400
3
+ +++ 13-b/configure.ac 2024-05-19 07:42:23.294762624 -0400
4
+ @@ -1090,12 +1090,7 @@
5
+ dnl architecture. PLATFORM_TRIPLET will be a pair or single value for these
6
+ dnl platforms.
7
+ AC_MSG_CHECKING([for multiarch])
8
+ - AS_CASE([$ac_sys_system],
9
+ - [Darwin*], [MULTIARCH=""],
10
+ - [iOS], [MULTIARCH=""],
11
+ - [FreeBSD*], [MULTIARCH=""],
12
+ - [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
13
+ - )
14
+ + MULTIARCH=x86_64-linux-musl
15
+ AC_SUBST([MULTIARCH])
16
+
17
+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
You can’t perform that action at this time.
0 commit comments