File tree Expand file tree Collapse file tree 6 files changed +3
-66
lines changed Expand file tree Collapse file tree 6 files changed +3
-66
lines changed Original file line number Diff line number Diff line change @@ -29,10 +29,6 @@ RUN for s in debian_jessie debian_jessie-updates debian-security_jessie/updates;
29
29
echo 'Acquire::Retries "5";' ; \
30
30
) > /etc/apt/apt.conf.d/99cpython-portable
31
31
32
- RUN ( echo 'amd64' ; \
33
- echo 'i386' ; \
34
- ) > /var/lib/dpkg/arch
35
-
36
32
# apt iterates all available file descriptors up to rlim_max and calls
37
33
# fcntl(fd, F_SETFD, FD_CLOEXEC). This can result in millions of system calls
38
34
# (we've seen 1B in the wild) and cause operations to take seconds to minutes.
Original file line number Diff line number Diff line change 91
91
92
92
# Configure nerfs RUNSHARED when cross-compiling, which prevents PGO from running when
93
93
# we can in fact run the target binaries (e.g. x86_64 host and i686 target). Undo that.
94
+ # TODO this may not be needed after removing support for i686 builds. But it
95
+ # may still be useful since CPython's definition of cross-compiling has historically
96
+ # been very liberal and kicks in when it arguably shouldn't.
94
97
if [ -n " ${CROSS_COMPILING} " ]; then
95
98
if [ -n " ${PYTHON_MEETS_MINIMUM_VERSION_3_14} " ]; then
96
99
patch -p1 -i ${ROOT} /patch-dont-clear-runshared-14.patch
@@ -1058,9 +1061,6 @@ armv7-unknown-linux-gnueabi)
1058
1061
armv7-unknown-linux-gnueabihf)
1059
1062
PYTHON_ARCH=" arm-linux-gnueabihf"
1060
1063
;;
1061
- i686-unknown-linux-gnu)
1062
- PYTHON_ARCH=" i386-linux-gnu"
1063
- ;;
1064
1064
mips-unknown-linux-gnu)
1065
1065
PYTHON_ARCH=" mips-linux-gnu"
1066
1066
;;
Original file line number Diff line number Diff line change @@ -54,9 +54,6 @@ if [ -n "${CROSS_COMPILING}" ]; then
54
54
armv7-unknown-linux-gnueabihf)
55
55
EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
56
56
;;
57
- i686-unknown-linux-gnu)
58
- EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
59
- ;;
60
57
mips-unknown-linux-gnu)
61
58
EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
62
59
;;
@@ -81,9 +78,6 @@ if [ -n "${CROSS_COMPILING}" ]; then
81
78
aarch64-unknown-linux-musl)
82
79
EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
83
80
;;
84
- i686-unknown-linux-musl)
85
- EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
86
- ;;
87
81
mips-unknown-linux-musl)
88
82
EXTRA_FLAGS=" ${EXTRA_FLAGS} --enable-malloc0returnsnull"
89
83
;;
Original file line number Diff line number Diff line change 1
1
{% include 'base.Dockerfile' %}
2
2
3
- # libc6-dev:i386 pulls in 32-bit system libraries to enable cross-compiling
4
- # to i386.
5
- #
6
3
# libffi-dev and zlib1g-dev are present so host Python (during cross-builds)
7
4
# can build the ctypes and zlib extensions. So comment in build-cpython.sh
8
5
# for more context.
@@ -14,7 +11,6 @@ RUN ulimit -n 10000 && apt-get install \
14
11
bzip2 \
15
12
file \
16
13
libc6-dev \
17
- libc6-dev:i386 \
18
14
libffi-dev \
19
15
make \
20
16
patch \
Original file line number Diff line number Diff line change @@ -249,7 +249,6 @@ _decimal:
249
249
- define : CONFIG_32=1
250
250
targets :
251
251
- armv7-.*
252
- - i686-.*
253
252
- mips-.*
254
253
- mipsel-.*
255
254
- define : CONFIG_64=1
@@ -299,7 +298,6 @@ _hashlib:
299
298
# a static library so there isn't a runtime dependency.
300
299
- name : ' :libatomic.a'
301
300
targets :
302
- - i686-unknown-linux-gnu
303
301
- mips-unknown-linux-gnu
304
302
- mipsel-unknown-linux-gnu
305
303
- x86_64.*-unknown-linux-gnu
@@ -570,7 +568,6 @@ _ssl:
570
568
# a static library so there isn't a runtime dependency.
571
569
- name : ' :libatomic.a'
572
570
targets :
573
- - i686-unknown-linux-gnu
574
571
- mips-unknown-linux-gnu
575
572
- mipsel-unknown-linux-gnu
576
573
- x86_64.*-unknown-linux-gnu
Original file line number Diff line number Diff line change @@ -318,52 +318,6 @@ armv7-unknown-linux-gnueabihf:
318
318
- zlib
319
319
openssl_target : linux-armv4
320
320
321
- i686-unknown-linux-gnu :
322
- host_platforms :
323
- - linux_x86_64
324
- pythons_supported :
325
- - ' 3.9'
326
- - ' 3.10'
327
- - ' 3.11'
328
- - ' 3.12'
329
- - ' 3.13'
330
- - ' 3.14'
331
- needs_toolchain : true
332
- host_cc : clang
333
- host_cxx : clang++
334
- target_cc : clang
335
- target_cxx : clang++
336
- target_cflags :
337
- - ' -m32'
338
- - ' -fvisibility=hidden'
339
- target_ldflags :
340
- - ' -m32'
341
- needs :
342
- - autoconf
343
- - bdb
344
- - binutils
345
- - bzip2
346
- - expat
347
- - libedit
348
- - libffi
349
- - libX11
350
- - libXau
351
- - libxcb
352
- - m4
353
- - mpdecimal
354
- - ncurses
355
- - openssl-3.0
356
- - patchelf
357
- - sqlite
358
- - tcl
359
- - tk
360
- - tix
361
- - uuid
362
- - xorgproto
363
- - xz
364
- - zlib
365
- openssl_target : linux-x86-clang
366
-
367
321
mips-unknown-linux-gnu :
368
322
host_platforms :
369
323
- linux_x86_64
You can’t perform that action at this time.
0 commit comments