Skip to content

Commit 88ba87d

Browse files
yosifkityosifkit
committed
Fix _ctypes test failure on Alpine and build failure on Debian on ppc64le
1 parent 79ceb74 commit 88ba87d

18 files changed

+68
-0
lines changed

‎3.3/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.3/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ RUN set -ex \
4141
bzip2-dev \
4242
coreutils \
4343
dpkg-dev dpkg \
44+
expat-dev \
4445
gcc \
4546
gdbm-dev \
4647
libc-dev \
48+
libffi-dev \
4749
linux-headers \
4850
make \
4951
ncurses-dev \
@@ -66,6 +68,8 @@ RUN set -ex \
6668
--build="$gnuArch" \
6769
--enable-loadable-sqlite-extensions \
6870
--enable-shared \
71+
--with-system-expat \
72+
--with-system-ffi \
6973
--without-ensurepip \
7074
&& make -j "$(nproc)" \
7175
&& make install \

‎3.3/slim/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENV LANG C.UTF-8
1616
# runtime dependencies
1717
RUN apt-get update && apt-get install -y --no-install-recommends \
1818
ca-certificates \
19+
libexpat1 \
20+
libffi6 \
1921
libgdbm3 \
2022
libsqlite3-0 \
2123
libssl1.0.0 \
@@ -30,6 +32,8 @@ RUN set -ex \
3032
gcc \
3133
libbz2-dev \
3234
libc6-dev \
35+
libexpat1-dev \
36+
libffi-dev \
3337
libgdbm-dev \
3438
liblzma-dev \
3539
libncurses-dev \
@@ -61,6 +65,8 @@ RUN set -ex \
6165
--build="$gnuArch" \
6266
--enable-loadable-sqlite-extensions \
6367
--enable-shared \
68+
--with-system-expat \
69+
--with-system-ffi \
6470
--without-ensurepip \
6571
&& make -j "$(nproc)" \
6672
&& make install \

‎3.3/wheezy/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.4/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.4/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ RUN set -ex \
4141
bzip2-dev \
4242
coreutils \
4343
dpkg-dev dpkg \
44+
expat-dev \
4445
gcc \
4546
gdbm-dev \
4647
libc-dev \
48+
libffi-dev \
4749
linux-headers \
4850
make \
4951
ncurses-dev \
@@ -66,6 +68,8 @@ RUN set -ex \
6668
--build="$gnuArch" \
6769
--enable-loadable-sqlite-extensions \
6870
--enable-shared \
71+
--with-system-expat \
72+
--with-system-ffi \
6973
--without-ensurepip \
7074
&& make -j "$(nproc)" \
7175
&& make install \

‎3.4/slim/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENV LANG C.UTF-8
1616
# runtime dependencies
1717
RUN apt-get update && apt-get install -y --no-install-recommends \
1818
ca-certificates \
19+
libexpat1 \
20+
libffi6 \
1921
libgdbm3 \
2022
libsqlite3-0 \
2123
libssl1.0.0 \
@@ -30,6 +32,8 @@ RUN set -ex \
3032
gcc \
3133
libbz2-dev \
3234
libc6-dev \
35+
libexpat1-dev \
36+
libffi-dev \
3337
libgdbm-dev \
3438
liblzma-dev \
3539
libncurses-dev \
@@ -61,6 +65,8 @@ RUN set -ex \
6165
--build="$gnuArch" \
6266
--enable-loadable-sqlite-extensions \
6367
--enable-shared \
68+
--with-system-expat \
69+
--with-system-ffi \
6470
--without-ensurepip \
6571
&& make -j "$(nproc)" \
6672
&& make install \

‎3.4/wheezy/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.5/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.5/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ RUN set -ex \
4141
bzip2-dev \
4242
coreutils \
4343
dpkg-dev dpkg \
44+
expat-dev \
4445
gcc \
4546
gdbm-dev \
4647
libc-dev \
48+
libffi-dev \
4749
linux-headers \
4850
make \
4951
ncurses-dev \
@@ -66,6 +68,8 @@ RUN set -ex \
6668
--build="$gnuArch" \
6769
--enable-loadable-sqlite-extensions \
6870
--enable-shared \
71+
--with-system-expat \
72+
--with-system-ffi \
6973
--without-ensurepip \
7074
&& make -j "$(nproc)" \
7175
&& make install \

‎3.5/slim/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENV LANG C.UTF-8
1616
# runtime dependencies
1717
RUN apt-get update && apt-get install -y --no-install-recommends \
1818
ca-certificates \
19+
libexpat1 \
20+
libffi6 \
1921
libgdbm3 \
2022
libsqlite3-0 \
2123
libssl1.0.0 \
@@ -30,6 +32,8 @@ RUN set -ex \
3032
gcc \
3133
libbz2-dev \
3234
libc6-dev \
35+
libexpat1-dev \
36+
libffi-dev \
3337
libgdbm-dev \
3438
liblzma-dev \
3539
libncurses-dev \
@@ -61,6 +65,8 @@ RUN set -ex \
6165
--build="$gnuArch" \
6266
--enable-loadable-sqlite-extensions \
6367
--enable-shared \
68+
--with-system-expat \
69+
--with-system-ffi \
6470
--without-ensurepip \
6571
&& make -j "$(nproc)" \
6672
&& make install \

‎3.6/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ RUN set -ex \
4646
--build="$gnuArch" \
4747
--enable-loadable-sqlite-extensions \
4848
--enable-shared \
49+
--with-system-expat \
50+
--with-system-ffi \
4951
--without-ensurepip \
5052
&& make -j "$(nproc)" \
5153
&& make install \

‎3.6/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ RUN set -ex \
4141
bzip2-dev \
4242
coreutils \
4343
dpkg-dev dpkg \
44+
expat-dev \
4445
gcc \
4546
gdbm-dev \
4647
libc-dev \
48+
libffi-dev \
4749
linux-headers \
4850
make \
4951
ncurses-dev \
@@ -66,6 +68,8 @@ RUN set -ex \
6668
--build="$gnuArch" \
6769
--enable-loadable-sqlite-extensions \
6870
--enable-shared \
71+
--with-system-expat \
72+
--with-system-ffi \
6973
--without-ensurepip \
7074
&& make -j "$(nproc)" \
7175
&& make install \

‎3.6/alpine3.6/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ RUN set -ex \
4141
bzip2-dev \
4242
coreutils \
4343
dpkg-dev dpkg \
44+
expat-dev \
4445
gcc \
4546
gdbm-dev \
4647
libc-dev \
48+
libffi-dev \
4749
linux-headers \
4850
make \
4951
ncurses-dev \
@@ -66,6 +68,8 @@ RUN set -ex \
6668
--build="$gnuArch" \
6769
--enable-loadable-sqlite-extensions \
6870
--enable-shared \
71+
--with-system-expat \
72+
--with-system-ffi \
6973
--without-ensurepip \
7074
&& make -j "$(nproc)" \
7175
&& make install \

‎3.6/slim/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENV LANG C.UTF-8
1616
# runtime dependencies
1717
RUN apt-get update && apt-get install -y --no-install-recommends \
1818
ca-certificates \
19+
libexpat1 \
20+
libffi6 \
1921
libgdbm3 \
2022
libsqlite3-0 \
2123
libssl1.0.0 \
@@ -30,6 +32,8 @@ RUN set -ex \
3032
gcc \
3133
libbz2-dev \
3234
libc6-dev \
35+
libexpat1-dev \
36+
libffi-dev \
3337
libgdbm-dev \
3438
liblzma-dev \
3539
libncurses-dev \
@@ -61,6 +65,8 @@ RUN set -ex \
6165
--build="$gnuArch" \
6266
--enable-loadable-sqlite-extensions \
6367
--enable-shared \
68+
--with-system-expat \
69+
--with-system-ffi \
6470
--without-ensurepip \
6571
&& make -j "$(nproc)" \
6672
&& make install \

‎Dockerfile-alpine.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ RUN set -ex \
3535
bzip2-dev \
3636
coreutils \
3737
dpkg-dev dpkg \
38+
expat-dev \
3839
gcc \
3940
gdbm-dev \
4041
libc-dev \
42+
libffi-dev \
4143
linux-headers \
4244
make \
4345
ncurses-dev \
@@ -60,6 +62,8 @@ RUN set -ex \
6062
--build="$gnuArch" \
6163
--enable-loadable-sqlite-extensions \
6264
--enable-shared \
65+
--with-system-expat \
66+
--with-system-ffi \
6367
--without-ensurepip \
6468
&& make -j "$(nproc)" \
6569
&& make install \

‎Dockerfile-debian.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ RUN set -ex \
4040
--build="$gnuArch" \
4141
--enable-loadable-sqlite-extensions \
4242
--enable-shared \
43+
--with-system-expat \
44+
--with-system-ffi \
4345
--without-ensurepip \
4446
&& make -j "$(nproc)" \
4547
&& make install \

‎Dockerfile-slim.template

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ ENV LANG C.UTF-8
1010
# runtime dependencies
1111
RUN apt-get update && apt-get install -y --no-install-recommends \
1212
ca-certificates \
13+
libexpat1 \
14+
libffi6 \
1315
libgdbm3 \
1416
libsqlite3-0 \
1517
libssl1.0.0 \
@@ -24,6 +26,8 @@ RUN set -ex \
2426
gcc \
2527
libbz2-dev \
2628
libc6-dev \
29+
libexpat1-dev \
30+
libffi-dev \
2731
libgdbm-dev \
2832
liblzma-dev \
2933
libncurses-dev \
@@ -55,6 +59,8 @@ RUN set -ex \
5559
--build="$gnuArch" \
5660
--enable-loadable-sqlite-extensions \
5761
--enable-shared \
62+
--with-system-expat \
63+
--with-system-ffi \
5864
--without-ensurepip \
5965
&& make -j "$(nproc)" \
6066
&& make install \

0 commit comments

Comments
 (0)