From fafc19ddca5f19e6179cc4745456c4423d0ab428 Mon Sep 17 00:00:00 2001 From: Peter Martini Date: Thu, 2 Oct 2014 21:50:46 -0400 Subject: [PATCH] 5.18.2 -> 5.18.4, fix for gcc4.9, and sha1 check --- .../Dockerfile | 16 ++++++++++------ 5.018.004-64bit,threaded/sha1.txt | 1 + .../Dockerfile | 16 +++++++++++----- 5.018.004-64bit/sha1.txt | 1 + 4 files changed, 23 insertions(+), 11 deletions(-) rename {5.018.002-64bit => 5.018.004-64bit,threaded}/Dockerfile (50%) create mode 100644 5.018.004-64bit,threaded/sha1.txt rename {5.018.002-64bit,threaded => 5.018.004-64bit}/Dockerfile (52%) create mode 100644 5.018.004-64bit/sha1.txt diff --git a/5.018.002-64bit/Dockerfile b/5.018.004-64bit,threaded/Dockerfile similarity index 50% rename from 5.018.002-64bit/Dockerfile rename to 5.018.004-64bit,threaded/Dockerfile index 7f1d78f..b359454 100644 --- a/5.018.002-64bit/Dockerfile +++ b/5.018.004-64bit,threaded/Dockerfile @@ -3,12 +3,16 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps -RUN mkdir /usr/src/perl -WORKDIR /usr/src/perl -RUN curl -SL http://www.cpan.org/src/5.0/perl-5.18.2.tar.gz \ - | tar -xz --strip-components=1 +WORKDIR /tmp +ADD sha1.txt /tmp/sha1.txt +RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o /tmp/perl-5.18.4.tar.bz2 +RUN sha1sum -c /tmp/sha1.txt -RUN ./Configure -Duse64bitall -des \ +WORKDIR /usr/src/perl +RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2 +RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt +# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+ +RUN ./Configure -Dusethreads -A ccflags=-fwrapv -Duse64bitall -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \ && make install \ @@ -22,4 +26,4 @@ RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ WORKDIR /root -CMD ["perl5.18.2","-de0"] +CMD ["perl5.18.4","-de0"] diff --git a/5.018.004-64bit,threaded/sha1.txt b/5.018.004-64bit,threaded/sha1.txt new file mode 100644 index 0000000..bdf4327 --- /dev/null +++ b/5.018.004-64bit,threaded/sha1.txt @@ -0,0 +1 @@ +69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2 diff --git a/5.018.002-64bit,threaded/Dockerfile b/5.018.004-64bit/Dockerfile similarity index 52% rename from 5.018.002-64bit,threaded/Dockerfile rename to 5.018.004-64bit/Dockerfile index f31588a..c7836b9 100644 --- a/5.018.002-64bit,threaded/Dockerfile +++ b/5.018.004-64bit/Dockerfile @@ -4,11 +4,17 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps RUN mkdir /usr/src/perl -WORKDIR /usr/src/perl -RUN curl -SL http://www.cpan.org/src/5.0/perl-5.18.2.tar.gz \ - | tar -xz --strip-components=1 -RUN ./Configure -Dusethreads -Duse64bitall -des \ +WORKDIR /tmp +ADD sha1.txt /tmp/sha1.txt +RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o /tmp/perl-5.18.4.tar.bz2 +RUN sha1sum -c /tmp/sha1.txt + +WORKDIR /usr/src/perl +RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2 +RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt +# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+ +RUN ./Configure -Duse64bitall -A ccflags=-fwrapv -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \ && make install \ @@ -22,4 +28,4 @@ RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ WORKDIR /root -CMD ["perl5.18.2","-de0"] +CMD ["perl5.18.4","-de0"] diff --git a/5.018.004-64bit/sha1.txt b/5.018.004-64bit/sha1.txt new file mode 100644 index 0000000..bdf4327 --- /dev/null +++ b/5.018.004-64bit/sha1.txt @@ -0,0 +1 @@ +69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2