Merge pull request docker-library#358 from blopker/feature/python2.7-ffi

tianon · web-flow · commit 1acbbc67c03e · 2018-12-06T16:13:55.000-08:00
Use system FFI and expat
diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile
@@ -44,10 +44,12 @@ RUN set -ex \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
+		expat-dev \
 		findutils \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libffi-dev \
 		libressl \
 		libressl-dev \
 		linux-headers \
@@ -69,6 +71,8 @@ RUN set -ex \
 		--build="$gnuArch" \
 		--enable-shared \
 		--enable-unicode=ucs4 \
+		--with-system-expat \
+		--with-system-ffi \
 	&& make -j "$(nproc)" \
 # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
 # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile
@@ -43,10 +43,12 @@ RUN set -ex \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
+		expat-dev \
 		findutils \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libffi-dev \
 		libnsl-dev \
 		libressl-dev \
 		libtirpc-dev \
@@ -69,6 +71,8 @@ RUN set -ex \
 		--build="$gnuArch" \
 		--enable-shared \
 		--enable-unicode=ucs4 \
+		--with-system-expat \
+		--with-system-ffi \
 	&& make -j "$(nproc)" \
 # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
 # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile
@@ -43,10 +43,12 @@ RUN set -ex \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
+		expat-dev \
 		findutils \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libffi-dev \
 		libnsl-dev \
 		libressl-dev \
 		libtirpc-dev \
@@ -69,6 +71,8 @@ RUN set -ex \
 		--build="$gnuArch" \
 		--enable-shared \
 		--enable-unicode=ucs4 \
+		--with-system-expat \
+		--with-system-ffi \
 	&& make -j "$(nproc)" \
 # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
 # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template
@@ -38,10 +38,12 @@ RUN set -ex \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
+		expat-dev \
 		findutils \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libffi-dev \
 		libnsl-dev \
 		libressl \
 		libressl-dev \
@@ -65,6 +67,8 @@ RUN set -ex \
 		--build="$gnuArch" \
 		--enable-shared \
 		--enable-unicode=ucs4 \
+		--with-system-expat \
+		--with-system-ffi \
 	&& make -j "$(nproc)" \
 # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
 # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
