Skip to content

Commit fafc19d

Browse files
committed
5.18.2 -> 5.18.4, fix for gcc4.9, and sha1 check
1 parent 4099593 commit fafc19d

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

5.018.002-64bit/Dockerfile renamed to 5.018.004-64bit,threaded/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ MAINTAINER Peter Martini <[email protected]>
33

44
RUN apt-get update && apt-get install -y curl procps
55

6-
RUN mkdir /usr/src/perl
7-
WORKDIR /usr/src/perl
8-
RUN curl -SL http://www.cpan.org/src/5.0/perl-5.18.2.tar.gz \
9-
| tar -xz --strip-components=1
6+
WORKDIR /tmp
7+
ADD sha1.txt /tmp/sha1.txt
8+
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
9+
RUN sha1sum -c /tmp/sha1.txt
1010

11-
RUN ./Configure -Duse64bitall -des \
11+
WORKDIR /usr/src/perl
12+
RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2
13+
RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt
14+
# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+
15+
RUN ./Configure -Dusethreads -A ccflags=-fwrapv -Duse64bitall -des \
1216
&& make -j$(nproc) \
1317
&& TEST_JOBS=$(nproc) make test_harness \
1418
&& make install \
@@ -22,4 +26,4 @@ RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
2226

2327
WORKDIR /root
2428

25-
CMD ["perl5.18.2","-de0"]
29+
CMD ["perl5.18.4","-de0"]

5.018.004-64bit,threaded/sha1.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2

5.018.002-64bit,threaded/Dockerfile renamed to 5.018.004-64bit/Dockerfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ MAINTAINER Peter Martini <[email protected]>
44
RUN apt-get update && apt-get install -y curl procps
55

66
RUN mkdir /usr/src/perl
7-
WORKDIR /usr/src/perl
8-
RUN curl -SL http://www.cpan.org/src/5.0/perl-5.18.2.tar.gz \
9-
| tar -xz --strip-components=1
107

11-
RUN ./Configure -Dusethreads -Duse64bitall -des \
8+
WORKDIR /tmp
9+
ADD sha1.txt /tmp/sha1.txt
10+
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
11+
RUN sha1sum -c /tmp/sha1.txt
12+
13+
WORKDIR /usr/src/perl
14+
RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2
15+
RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt
16+
# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+
17+
RUN ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
1218
&& make -j$(nproc) \
1319
&& TEST_JOBS=$(nproc) make test_harness \
1420
&& make install \
@@ -22,4 +28,4 @@ RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
2228

2329
WORKDIR /root
2430

25-
CMD ["perl5.18.2","-de0"]
31+
CMD ["perl5.18.4","-de0"]

5.018.004-64bit/sha1.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2

0 commit comments

Comments
 (0)