Skip to content
This repository was archived by the owner on Mar 28, 2019. It is now read-only.

Commit eb3aa0a

Browse files
committed
Upstream: Add explicit "--build" to our "./configure" invocations
* docker-library/python#198
1 parent 34666ea commit eb3aa0a

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

2.7/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,21 @@ RUN set -ex \
2626
&& rm python.tar.xz \
2727
\
2828
&& apk add --no-cache --virtual .build-deps \
29+
coreutils \
30+
dpkg-dev dpkg \
2931
tcl-dev \
3032
tk \
3133
tk-dev \
3234
# add build deps before removing fetch deps in case there's overlap
3335
&& apk del .fetch-deps \
3436
\
3537
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3639
&& ./configure \
40+
--build="$gnuArch" \
3741
--enable-shared \
3842
--enable-unicode=ucs4 \
39-
&& make -j$(getconf _NPROCESSORS_ONLN) \
43+
&& make -j$(nproc) \
4044
&& make install \
4145
\
4246
&& runDeps="$( \

3.5/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@ RUN set -ex \
2626
&& rm python.tar.xz \
2727
\
2828
&& apk add --no-cache --virtual .build-deps \
29+
coreutils \
30+
dpkg-dev dpkg \
2931
tcl-dev \
3032
tk \
3133
tk-dev \
3234
# add build deps before removing fetch deps in case there's overlap
3335
&& apk del .fetch-deps \
3436
\
3537
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3639
&& ./configure \
40+
--build="$gnuArch" \
3741
--enable-loadable-sqlite-extensions \
3842
--enable-shared \
3943
--without-ensurepip \
40-
&& make -j$(getconf _NPROCESSORS_ONLN) \
44+
&& make -j$(nproc) \
4145
&& make install \
4246
\
4347
&& runDeps="$( \

3.6/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@ RUN set -ex \
2626
&& rm python.tar.xz \
2727
\
2828
&& apk add --no-cache --virtual .build-deps \
29+
coreutils \
30+
dpkg-dev dpkg \
2931
tcl-dev \
3032
tk \
3133
tk-dev \
3234
# add build deps before removing fetch deps in case there's overlap
3335
&& apk del .fetch-deps \
3436
\
3537
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3639
&& ./configure \
40+
--build="$gnuArch" \
3741
--enable-loadable-sqlite-extensions \
3842
--enable-shared \
3943
--without-ensurepip \
40-
&& make -j$(getconf _NPROCESSORS_ONLN) \
44+
&& make -j$(nproc) \
4145
&& make install \
4246
\
4347
&& runDeps="$( \

0 commit comments

Comments
 (0)