Skip to content

Commit 3775eb7

Browse files
PeterMartiniPeterMartini
committed
Added 5.14.4
1 parent 1032fd1 commit 3775eb7

7 files changed

+170
-0
lines changed

‎5.014.004-64bit,threaded/0001-Configure-Avoid-Cppsym-warnings-for-extra-tokens-pe.patch

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 6f87f404fa51739971a4068da1f11443024f3fc4 Mon Sep 17 00:00:00 2001
2+
From: Andy Dougherty <[email protected]>
3+
Date: Wed, 6 Jun 2012 11:12:58 -0400
4+
Subject: [perl #113024] Configure: Avoid Cppsym warnings for extra tokens
5+
[perl #113024]
6+
7+
The cppsymbols can include macros such as __INT16_C(c), which can't
8+
be tested with a simple #ifdef. This patch strips off the opening
9+
parenthesis and everything following it. These macros were generated
10+
by cpp -dM.
11+
12+
Also ensure Cppsym.true list is sorted for later input to comm.
13+
(I noticed this while testing this change on Solaris.)
14+
---
15+
Configure | 5 +++--
16+
1 file changed, 3 insertions(+), 2 deletions(-)
17+
18+
diff --git a/Configure b/Configure
19+
index a780b81..3ae16ca 100755
20+
--- a/Configure
21+
+++ b/Configure
22+
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
23+
EOSH
24+
chmod +x Cppsym.try
25+
$eunicefix Cppsym.try
26+
-./Cppsym < Cppsym.know > Cppsym.true
27+
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
28+
: Add in any linux cpp "predefined macros":
29+
case "$osname::$gccversion" in
30+
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
31+
tHdrH=_tmpHdr
32+
rm -f $tHdrH'.h' $tHdrH
33+
touch $tHdrH'.h'
34+
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
35+
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
36+
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
37+
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
38+
if [ -s $tHdrH'_cppsym.real' ]; then
39+
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
40+
fi
41+
--
42+
2.1.4
43+

‎5.014.004-64bit,threaded/0002-UpdatePatchLevel.patch

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This should be auto-generated; for now, it's not,
2+
# simply because it should be generated before the build,
3+
# which means having the appropriate version's patchlevel.h
4+
# available, which I don't want to bake into the fetch just
5+
# yet.
6+
7+
--- a/patchlevel.h
8+
+++ b/patchlevel.h
9+
@@ -135,0 +136 @@
10+
+ ,"Backport of perl5 git 6f87f404fa51739971a4068da1f11443024f3fc4"

‎5.014.004-64bit,threaded/Dockerfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM buildpack-deps
2+
MAINTAINER Peter Martini <[email protected]>
3+
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
7+
8+
RUN mkdir /usr/src/perl
9+
COPY *.patch /usr/src/perl/
10+
WORKDIR /usr/src/perl
11+
12+
RUN curl -SL https://cpan.metacpan.org/authors/id/D/DA/DAPM/perl-5.14.4.tar.bz2 -o perl-5.14.4.tar.bz2 \
13+
&& echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
14+
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
15+
&& rm perl-5.14.4.tar.bz2 \
16+
&& cat *.patch | patch -p1 \
17+
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
18+
&& make -j$(nproc) \
19+
&& make test_harness \
20+
&& make install \
21+
&& cd /usr/src \
22+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23+
&& chmod +x cpanm \
24+
&& ./cpanm App::cpanminus \
25+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
26+
27+
WORKDIR /root
28+
29+
CMD ["perl5.14.4","-de0"]

‎5.014.004-64bit/0001-Configure-Avoid-Cppsym-warnings-for-extra-tokens-pe.patch

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 6f87f404fa51739971a4068da1f11443024f3fc4 Mon Sep 17 00:00:00 2001
2+
From: Andy Dougherty <[email protected]>
3+
Date: Wed, 6 Jun 2012 11:12:58 -0400
4+
Subject: [perl #113024] Configure: Avoid Cppsym warnings for extra tokens
5+
[perl #113024]
6+
7+
The cppsymbols can include macros such as __INT16_C(c), which can't
8+
be tested with a simple #ifdef. This patch strips off the opening
9+
parenthesis and everything following it. These macros were generated
10+
by cpp -dM.
11+
12+
Also ensure Cppsym.true list is sorted for later input to comm.
13+
(I noticed this while testing this change on Solaris.)
14+
---
15+
Configure | 5 +++--
16+
1 file changed, 3 insertions(+), 2 deletions(-)
17+
18+
diff --git a/Configure b/Configure
19+
index a780b81..3ae16ca 100755
20+
--- a/Configure
21+
+++ b/Configure
22+
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
23+
EOSH
24+
chmod +x Cppsym.try
25+
$eunicefix Cppsym.try
26+
-./Cppsym < Cppsym.know > Cppsym.true
27+
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
28+
: Add in any linux cpp "predefined macros":
29+
case "$osname::$gccversion" in
30+
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
31+
tHdrH=_tmpHdr
32+
rm -f $tHdrH'.h' $tHdrH
33+
touch $tHdrH'.h'
34+
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
35+
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
36+
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
37+
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
38+
if [ -s $tHdrH'_cppsym.real' ]; then
39+
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
40+
fi
41+
--
42+
2.1.4
43+

‎5.014.004-64bit/0002-UpdatePatchLevel.patch

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This should be auto-generated; for now, it's not,
2+
# simply because it should be generated before the build,
3+
# which means having the appropriate version's patchlevel.h
4+
# available, which I don't want to bake into the fetch just
5+
# yet.
6+
7+
--- a/patchlevel.h
8+
+++ b/patchlevel.h
9+
@@ -135,0 +136 @@
10+
+ ,"Backport of perl5 git 6f87f404fa51739971a4068da1f11443024f3fc4"

‎5.014.004-64bit/Dockerfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM buildpack-deps
2+
MAINTAINER Peter Martini <[email protected]>
3+
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
7+
8+
RUN mkdir /usr/src/perl
9+
COPY *.patch /usr/src/perl/
10+
WORKDIR /usr/src/perl
11+
12+
RUN curl -SL https://cpan.metacpan.org/authors/id/D/DA/DAPM/perl-5.14.4.tar.bz2 -o perl-5.14.4.tar.bz2 \
13+
&& echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
14+
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
15+
&& rm perl-5.14.4.tar.bz2 \
16+
&& cat *.patch | patch -p1 \
17+
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
18+
&& make -j$(nproc) \
19+
&& make test_harness \
20+
&& make install \
21+
&& cd /usr/src \
22+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23+
&& chmod +x cpanm \
24+
&& ./cpanm App::cpanminus \
25+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
26+
27+
WORKDIR /root
28+
29+
CMD ["perl5.14.4","-de0"]

‎Releases.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
releases:
2+
- version: 5.14.4
3+
sha1: 3527c9e26f985cba98796439bf555fde8be73cdf
4+
pause: DAPM
5+
extra_flags: "-A ccflags=-fwrapv"
6+
test_parallel: no
7+
28
- version: 5.16.3
39
sha1: 060bc17cf9f142d043f9bf7b861422ec624875ea
410
pause: RJBS

0 commit comments

Comments
 (0)