Skip to content

Commit

Permalink
Add explicit "--build" to our "./configure" invocations
Browse files Browse the repository at this point in the history
  • Loading branch information
@tianon
tianon committed May 9, 2017
1 parent c3ff1c2 commit cd1f11a
Show file tree
Hide file tree
Showing 21 changed files with 75 additions and 6 deletions.
3 changes: 3 additions & 0 deletions 2.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -34,7 +35,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j "$(nproc)" \
Expand Down
6 changes: 5 additions & 1 deletion 2.7/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -52,10 +54,12 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions 2.7/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ENV PYTHON_VERSION 2.7.13

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
gcc \
libbz2-dev \
libc6-dev \
Expand Down Expand Up @@ -49,7 +50,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j "$(nproc)" \
Expand Down
3 changes: 3 additions & 0 deletions 2.7/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -34,7 +35,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j "$(nproc)" \
Expand Down
3 changes: 3 additions & 0 deletions 3.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
6 changes: 5 additions & 1 deletion 3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -59,11 +61,13 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions 3.3/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.3.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
gcc \
libbz2-dev \
libc6-dev \
Expand Down Expand Up @@ -55,7 +56,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
3 changes: 3 additions & 0 deletions 3.3/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
3 changes: 3 additions & 0 deletions 3.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.4.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
6 changes: 5 additions & 1 deletion 3.4/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -59,11 +61,13 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions 3.4/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.4.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
gcc \
libbz2-dev \
libc6-dev \
Expand Down Expand Up @@ -55,7 +56,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
3 changes: 3 additions & 0 deletions 3.4/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.4.6

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
3 changes: 3 additions & 0 deletions 3.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.5.3

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
6 changes: 5 additions & 1 deletion 3.5/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -59,11 +61,13 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions 3.5/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.5.3

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
gcc \
libbz2-dev \
libc6-dev \
Expand Down Expand Up @@ -55,7 +56,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
3 changes: 3 additions & 0 deletions 3.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.6.1

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -40,7 +41,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
6 changes: 5 additions & 1 deletion 3.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -59,11 +61,13 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions 3.6/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.6.1

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
gcc \
libbz2-dev \
libc6-dev \
Expand Down Expand Up @@ -55,7 +56,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -ex \
\
&& apk add --no-cache --virtual .build-deps \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
gcc \
gdbm-dev \
libc-dev \
Expand All @@ -53,11 +55,13 @@ RUN set -ex \
&& apk del .fetch-deps \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
&& make -j "$(nproc)" \
&& make install \
\
&& runDeps="$( \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV PYTHON_VERSION %%PLACEHOLDER%%

RUN set -ex \
&& buildDeps=' \
dpkg-dev \
tcl-dev \
tk-dev \
' \
Expand All @@ -34,7 +35,9 @@ RUN set -ex \
&& rm python.tar.xz \
\
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--without-ensurepip \
Expand Down
Loading

0 comments on commit cd1f11a

Please sign in to comment.