Skip to content

Commit 6d31b8c

Browse files
authored
Merge pull request #205 from infosiftr/arch-fixes
Fix _ctypes test failure on Alpine and build failure on Debian on ppc64le
2 parents 79ceb74 + 88ba87d commit 6d31b8c

File tree

18 files changed

+68
-0
lines changed

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 \

0 commit comments

Comments
 (0)