diff --git a/5.020.002-64bit,threaded/DevelPatchPerl.patch b/5.020.003-64bit,threaded/DevelPatchPerl.patch similarity index 98% rename from 5.020.002-64bit,threaded/DevelPatchPerl.patch rename to 5.020.003-64bit,threaded/DevelPatchPerl.patch index 7579a39..90a3b7d 100644 --- a/5.020.002-64bit,threaded/DevelPatchPerl.patch +++ b/5.020.003-64bit,threaded/DevelPatchPerl.patch @@ -36,7 +36,7 @@ index 956adfc..fb5a46e 100644 if ldd $DBLIB | grep pthread >/dev/null then diff --git a/patchlevel.h b/patchlevel.h -index 07e1217..8016ec8 100644 +index f416602..4917564 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -137,6 +137,7 @@ static const char * const local_patches[] = { diff --git a/5.020.002-64bit,threaded/Dockerfile b/5.020.003-64bit,threaded/Dockerfile similarity index 69% rename from 5.020.002-64bit,threaded/Dockerfile rename to 5.020.003-64bit,threaded/Dockerfile index a0bc69b..86127cf 100644 --- a/5.020.002-64bit,threaded/Dockerfile +++ b/5.020.003-64bit,threaded/Dockerfile @@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl -RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.2.tar.bz2 -o perl-5.20.2.tar.bz2 \ - && echo '63126c683b4c79c35008a47d56f7beae876c569f *perl-5.20.2.tar.bz2' | sha1sum -c - \ - && tar --strip-components=1 -xjf perl-5.20.2.tar.bz2 -C /usr/src/perl \ - && rm perl-5.20.2.tar.bz2 \ +RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \ + && echo 'eedf9e3be3c83bef15911996ed18703cffe4d113 *perl-5.20.3.tar.bz2' | sha1sum -c - \ + && tar --strip-components=1 -xjf perl-5.20.3.tar.bz2 -C /usr/src/perl \ + && rm perl-5.20.3.tar.bz2 \ && cat *.patch | patch -p1 \ && ./Configure -Dusethreads -Duse64bitall -des \ && make -j$(nproc) \ - && make test_harness \ + && TEST_JOBS=$(nproc) make test_harness \ && make install \ && cd /usr/src \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ @@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.2.tar.bz2 WORKDIR /root -CMD ["perl5.20.2","-de0"] +CMD ["perl5.20.3","-de0"] diff --git a/5.020.002-64bit/DevelPatchPerl.patch b/5.020.003-64bit/DevelPatchPerl.patch similarity index 98% rename from 5.020.002-64bit/DevelPatchPerl.patch rename to 5.020.003-64bit/DevelPatchPerl.patch index 7579a39..90a3b7d 100644 --- a/5.020.002-64bit/DevelPatchPerl.patch +++ b/5.020.003-64bit/DevelPatchPerl.patch @@ -36,7 +36,7 @@ index 956adfc..fb5a46e 100644 if ldd $DBLIB | grep pthread >/dev/null then diff --git a/patchlevel.h b/patchlevel.h -index 07e1217..8016ec8 100644 +index f416602..4917564 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -137,6 +137,7 @@ static const char * const local_patches[] = { diff --git a/5.020.002-64bit/Dockerfile b/5.020.003-64bit/Dockerfile similarity index 68% rename from 5.020.002-64bit/Dockerfile rename to 5.020.003-64bit/Dockerfile index 31eea80..2973da9 100644 --- a/5.020.002-64bit/Dockerfile +++ b/5.020.003-64bit/Dockerfile @@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl -RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.2.tar.bz2 -o perl-5.20.2.tar.bz2 \ - && echo '63126c683b4c79c35008a47d56f7beae876c569f *perl-5.20.2.tar.bz2' | sha1sum -c - \ - && tar --strip-components=1 -xjf perl-5.20.2.tar.bz2 -C /usr/src/perl \ - && rm perl-5.20.2.tar.bz2 \ +RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \ + && echo 'eedf9e3be3c83bef15911996ed18703cffe4d113 *perl-5.20.3.tar.bz2' | sha1sum -c - \ + && tar --strip-components=1 -xjf perl-5.20.3.tar.bz2 -C /usr/src/perl \ + && rm perl-5.20.3.tar.bz2 \ && cat *.patch | patch -p1 \ && ./Configure -Duse64bitall -des \ && make -j$(nproc) \ - && make test_harness \ + && TEST_JOBS=$(nproc) make test_harness \ && make install \ && cd /usr/src \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ @@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.2.tar.bz2 WORKDIR /root -CMD ["perl5.20.2","-de0"] +CMD ["perl5.20.3","-de0"] diff --git a/Releases.yaml b/Releases.yaml index 1efe5e0..36018f9 100644 --- a/Releases.yaml +++ b/Releases.yaml @@ -35,12 +35,10 @@ releases: extra_flags: "-A ccflags=-fwrapv" test_parallel: no - - version: 5.20.2 - sha1: 63126c683b4c79c35008a47d56f7beae876c569f + - version: 5.20.3 + sha1: eedf9e3be3c83bef15911996ed18703cffe4d113 pause: SHAY - test_parallel: no - version: 5.22.0 sha1: 400338c91c56420d98142cbfcb84d418cae2c98c pause: RJBS - test_parallel: no