Skip to content

Commit e91894d

Browse files
author
James Harton
committed
Replace DEB_BUILD_GNU_TYPE with DEB_HOST_GNU_TYPE.
From the [CrossBuildPackagingGuidelines wiki page](https://wiki.debian.org/CrossBuildPackagingGuidelines) `DEB_BUILD_GNU_TYPE` is the architecture of the machine *building* the package, whereas `DEB_HOST_GNU_TYPE` is the architecture for which we are building the package. I noticed this issue while cross-compiling an ARM container on my Mac.
1 parent 7283bdc commit e91894d

File tree

17 files changed

+17
-17
lines changed

17 files changed

+17
-17
lines changed

‎17/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN set -xe \
1919
&& rm otp-src.tar.gz \
2020
&& cd /usr/src/otp-src \
2121
&& ./otp_build autoconf \
22-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
22+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
2323
&& ./configure --build="$gnuArch" \
2424
&& make -j$(nproc) \
2525
&& make install \

‎17/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN set -xe \
3232
&& rm otp-src.tar.gz \
3333
&& cd /usr/src/otp-src \
3434
&& ./otp_build autoconf \
35-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
35+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
3636
&& ./configure --build="$gnuArch" \
3737
&& make -j$(nproc) \
3838
&& make install \

‎18/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN set -xe \
2525
&& rm otp-src.tar.gz \
2626
&& ( cd $ERL_TOP \
2727
&& ./otp_build autoconf \
28-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
28+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
2929
&& ./configure --build="$gnuArch" \
3030
&& make -j$(nproc) \
3131
&& make install ) \

‎18/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe \
3838
&& rm otp-src.tar.gz \
3939
&& ( cd $ERL_TOP \
4040
&& ./otp_build autoconf \
41-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
41+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
4242
&& ./configure --build="$gnuArch" --enable-sctp \
4343
&& make -j$(nproc) \
4444
&& make install ) \

‎19/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN set -xe \
2424
&& rm otp-src.tar.gz \
2525
&& cd /usr/src/otp-src \
2626
&& ./otp_build autoconf \
27-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
27+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
2828
&& ./configure --build="$gnuArch" \
2929
--enable-dirty-schedulers \
3030
&& make -j$(nproc) \

‎19/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -xe \
3636
&& rm otp-src.tar.gz \
3737
&& cd /usr/src/otp-src \
3838
&& ./otp_build autoconf \
39-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
39+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
4040
&& ./configure --build="$gnuArch" \
4141
--enable-dirty-schedulers \
4242
&& make -j$(nproc) \

‎20/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN set -xe \
2424
&& rm otp-src.tar.gz \
2525
&& ( cd $ERL_TOP \
2626
&& ./otp_build autoconf \
27-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
27+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
2828
&& ./configure --build="$gnuArch" \
2929
&& make -j$(nproc) \
3030
&& make install ) \

‎20/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN set -xe \
3131
&& rm otp-src.tar.gz \
3232
&& ( cd $ERL_TOP \
3333
&& ./otp_build autoconf \
34-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
34+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
3535
&& ./configure --build="$gnuArch" \
3636
&& make -j$(getconf _NPROCESSORS_ONLN) \
3737
&& make install ) \

‎20/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe \
3838
&& rm otp-src.tar.gz \
3939
&& ( cd $ERL_TOP \
4040
&& ./otp_build autoconf \
41-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
41+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
4242
&& ./configure --build="$gnuArch" \
4343
&& make -j$(nproc) \
4444
&& make install ) \

‎21/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN set -xe \
2727
&& rm otp-src.tar.gz \
2828
&& ( cd $ERL_TOP \
2929
&& ./otp_build autoconf \
30-
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
30+
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
3131
&& ./configure --build="$gnuArch" \
3232
&& make -j$(nproc) \
3333
&& make install ) \

0 commit comments

Comments
 (0)