Skip to content

Commit cace6e7

Browse files
tianonzakame
tianon
authored and
zakame
committed
Adjust "./Configure" for wider architecture support
This adds an appropriate "-Darchname" value for cross-building (arm32v7 builds on an arm64v8 kernel, i386 builds on an amd64 kernel, etc), and conditionally converts "-Duse64bitall" into "-Duse64bitint" (which is what Debian uses when compiling Perl). See also https://sources.debian.net/src/perl/stretch/debian/config.debian/#L115 and https://sources.debian.net/src/perl/stretch/debian/config.debian/#L130. > *** You have chosen a maximally 64-bit build, > *** but your pointers are only 4 bytes wide. > *** Please rerun Configure without -Duse64bitall. > *** Since you have quads, you could possibly try with -Duse64bitint.
1 parent 8044d4b commit cace6e7

File tree

21 files changed

+86
-23
lines changed

21 files changed

+86
-23
lines changed

‎5.008.009-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.8.9.tar.bz2 -o perl-5.8.9.tar.b
99
&& tar --strip-components=1 -xjf perl-5.8.9.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.8.9.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.008.009-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.8.9.tar.bz2 -o perl-5.8.9.tar.b
99
&& tar --strip-components=1 -xjf perl-5.8.9.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.8.9.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.010.001-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.10.1.tar.bz2 -o perl-5.10.1.tar
99
&& tar --strip-components=1 -xjf perl-5.10.1.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.10.1.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.010.001-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.10.1.tar.bz2 -o perl-5.10.1.tar
99
&& tar --strip-components=1 -xjf perl-5.10.1.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.10.1.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.012.005-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.12.5.tar.bz2 -o perl-5.12.5.tar
99
&& tar --strip-components=1 -xjf perl-5.12.5.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.12.5.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.012.005-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.12.5.tar.bz2 -o perl-5.12.5.tar
99
&& tar --strip-components=1 -xjf perl-5.12.5.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.12.5.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.014.004-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.14.4.tar.bz2 -o perl-5.14.4.tar
99
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.14.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.014.004-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.14.4.tar.bz2 -o perl-5.14.4.tar
99
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.14.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.016.003-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.16.3.tar.bz2 -o perl-5.16.3.tar
99
&& tar --strip-components=1 -xjf perl-5.16.3.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.16.3.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.016.003-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.16.3.tar.bz2 -o perl-5.16.3.tar
99
&& tar --strip-components=1 -xjf perl-5.16.3.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.16.3.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.018.004-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar
99
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.18.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.018.004-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar
99
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.18.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -A ccflags=-fwrapv -des \
1316
&& make -j$(nproc) \
1417
&& make test_harness \
1518
&& make install \

‎5.020.003-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar
99
&& tar --strip-components=1 -xjf perl-5.20.3.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.20.3.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.020.003-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar
99
&& tar --strip-components=1 -xjf perl-5.20.3.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.20.3.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.022.004-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.bz2 -o perl-5.22.4.tar
99
&& tar --strip-components=1 -xjf perl-5.22.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.22.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.022.004-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.bz2 -o perl-5.22.4.tar
99
&& tar --strip-components=1 -xjf perl-5.22.4.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.22.4.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.024.002-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.2.tar.bz2 -o perl-5.24.2.tar
99
&& tar --strip-components=1 -xjf perl-5.24.2.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.24.2.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.024.002-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.2.tar.bz2 -o perl-5.24.2.tar
99
&& tar --strip-components=1 -xjf perl-5.24.2.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.24.2.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.026.000-64bit,threaded/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.0.tar.bz2 -o perl-5.26.0.tar
99
&& tar --strip-components=1 -xjf perl-5.26.0.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.26.0.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Dusethreads -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎5.026.000-64bit/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.0.tar.bz2 -o perl-5.26.0.tar
99
&& tar --strip-components=1 -xjf perl-5.26.0.tar.bz2 -C /usr/src/perl \
1010
&& rm perl-5.26.0.tar.bz2 \
1111
&& cat *.patch | patch -p1 \
12-
&& ./Configure -Duse64bitall -Duseshrplib -Dvendorprefix=/usr/local -des \
12+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
13+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
14+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
15+
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -des \
1316
&& make -j$(nproc) \
1417
&& TEST_JOBS=$(nproc) make test_harness \
1518
&& make install \

‎generate.pl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ sub die_with_sample {
4141
};
4242

4343
my %builds = (
44-
"64bit" => "-Duse64bitall $common",
45-
"64bit,threaded" => "-Dusethreads -Duse64bitall $common",
44+
"64bit" => "$common",
45+
"64bit,threaded" => "-Dusethreads $common",
4646
);
4747

4848
# sha256 taken from http://www.cpan.org/authors/id/M/MI/MIYAGAWA/CHECKSUMS
@@ -205,7 +205,10 @@ =head1 DESCRIPTION
205205
&& tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
206206
&& rm perl-{{version}}.tar.bz2 \
207207
&& cat *.patch | patch -p1 \
208-
&& ./Configure {{args}} {{extra_flags}} -des \
208+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
209+
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
210+
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
211+
&& ./Configure -Darchname="$gnuArch" "$archFlag" {{args}} {{extra_flags}} -des \
209212
&& make -j$(nproc) \
210213
&& {{test}} \
211214
&& make install \

0 commit comments

Comments
 (0)