Merge pull request #14 from Perl/allowpatches

Allowpatches

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

@@ -0,0 +1,43 @@
+From 6f87f404fa51739971a4068da1f11443024f3fc4 Mon Sep 17 00:00:00 2001
+From: Andy Dougherty <doughera@lafayette.edu>
+Date: Wed, 6 Jun 2012 11:12:58 -0400
+Subject: [perl #113024] Configure: Avoid Cppsym warnings for extra tokens
+ [perl #113024]
+
+The cppsymbols can include macros such as __INT16_C(c), which can't
+be tested with a simple #ifdef.  This patch strips off the opening
+parenthesis and everything following it.  These macros were generated
+by cpp -dM.
+
+Also ensure Cppsym.true list is sorted for later input to comm.
+(I noticed this while testing this change on Solaris.)
+---
+ Configure | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Configure b/Configure
+index a780b81..3ae16ca 100755
+--- a/Configure
++++ b/Configure
+@@ -21936,15 +21936,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
+ EOSH
+ chmod +x Cppsym.try
+ $eunicefix Cppsym.try
+-./Cppsym < Cppsym.know > Cppsym.true
++./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
+ : Add in any linux cpp "predefined macros":
+ case "$osname::$gccversion" in
+   *linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
+     tHdrH=_tmpHdr
+     rm -f $tHdrH'.h' $tHdrH
+     touch $tHdrH'.h'
++    # Filter out macro arguments, such as Linux's __INT8_C(c)
+     if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
+-       sed 's/#define[\ \  ]*//;s/[\ \     ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
++       sed -e 's/#define[\ \  ]*//;s/[\ \     ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
+        if [ -s $tHdrH'_cppsym.real' ]; then
+ 	  cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
+        fi
+-- 
+2.1.4
+

5.016.003-64bit,threaded/0002-UpdatePatchLevel.patch

@@ -0,0 +1,10 @@
+# This should be auto-generated; for now, it's not,
+# simply because it should be generated before the build,
+# which means having the appropriate version's patchlevel.h
+# available, which I don't want to bake into the fetch just
+# yet.
+
+--- a/patchlevel.h
++++ b/patchlevel.h
+@@ -135,0 +136 @@
++	,"Backport of perl5 git 6f87f404fa51739971a4068da1f11443024f3fc4"

5.016.003-64bit,threaded/Dockerfile

@@ -0,0 +1,29 @@
+FROM buildpack-deps
+MAINTAINER Peter Martini <PeterCMartini@GMail.com>
+
+RUN apt-get update \
+    && apt-get install -y curl procps \
+    && rm -fr /var/lib/apt/lists/*
+
+RUN mkdir /usr/src/perl
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.3.tar.bz2 -o perl-5.16.3.tar.bz2 \
+    && echo '060bc17cf9f142d043f9bf7b861422ec624875ea *perl-5.16.3.tar.bz2' | sha1sum -c - \
+    && tar --strip-components=1 -xjf perl-5.16.3.tar.bz2 -C /usr/src/perl \
+    && rm perl-5.16.3.tar.bz2 \
+    && cat *.patch | patch -p1 \
+    && ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
+    && make -j$(nproc) \
+    && make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
+    && chmod +x cpanm \
+    && ./cpanm App::cpanminus \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl
+
+WORKDIR /root
+
+CMD ["perl5.16.3","-de0"]

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

@@ -0,0 +1,43 @@
+From 6f87f404fa51739971a4068da1f11443024f3fc4 Mon Sep 17 00:00:00 2001
+From: Andy Dougherty <doughera@lafayette.edu>
+Date: Wed, 6 Jun 2012 11:12:58 -0400
+Subject: [perl #113024] Configure: Avoid Cppsym warnings for extra tokens
+ [perl #113024]
+
+The cppsymbols can include macros such as __INT16_C(c), which can't
+be tested with a simple #ifdef.  This patch strips off the opening
+parenthesis and everything following it.  These macros were generated
+by cpp -dM.
+
+Also ensure Cppsym.true list is sorted for later input to comm.
+(I noticed this while testing this change on Solaris.)
+---
+ Configure | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Configure b/Configure
+index a780b81..3ae16ca 100755
+--- a/Configure
++++ b/Configure
+@@ -21936,15 +21936,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
+ EOSH
+ chmod +x Cppsym.try
+ $eunicefix Cppsym.try
+-./Cppsym < Cppsym.know > Cppsym.true
++./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
+ : Add in any linux cpp "predefined macros":
+ case "$osname::$gccversion" in
+   *linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
+     tHdrH=_tmpHdr
+     rm -f $tHdrH'.h' $tHdrH
+     touch $tHdrH'.h'
++    # Filter out macro arguments, such as Linux's __INT8_C(c)
+     if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
+-       sed 's/#define[\ \  ]*//;s/[\ \     ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
++       sed -e 's/#define[\ \  ]*//;s/[\ \     ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
+        if [ -s $tHdrH'_cppsym.real' ]; then
+ 	  cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
+        fi
+-- 
+2.1.4
+

5.016.003-64bit/0002-UpdatePatchLevel.patch

@@ -0,0 +1,10 @@
+# This should be auto-generated; for now, it's not,
+# simply because it should be generated before the build,
+# which means having the appropriate version's patchlevel.h
+# available, which I don't want to bake into the fetch just
+# yet.
+
+--- a/patchlevel.h
++++ b/patchlevel.h
+@@ -135,0 +136 @@
++	,"Backport of perl5 git 6f87f404fa51739971a4068da1f11443024f3fc4"

5.016.003-64bit/Dockerfile

@@ -0,0 +1,29 @@
+FROM buildpack-deps
+MAINTAINER Peter Martini <PeterCMartini@GMail.com>
+
+RUN apt-get update \
+    && apt-get install -y curl procps \
+    && rm -fr /var/lib/apt/lists/*
+
+RUN mkdir /usr/src/perl
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.3.tar.bz2 -o perl-5.16.3.tar.bz2 \
+    && echo '060bc17cf9f142d043f9bf7b861422ec624875ea *perl-5.16.3.tar.bz2' | sha1sum -c - \
+    && tar --strip-components=1 -xjf perl-5.16.3.tar.bz2 -C /usr/src/perl \
+    && rm perl-5.16.3.tar.bz2 \
+    && cat *.patch | patch -p1 \
+    && ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
+    && make -j$(nproc) \
+    && make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
+    && chmod +x cpanm \
+    && ./cpanm App::cpanminus \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl
+
+WORKDIR /root
+
+CMD ["perl5.16.3","-de0"]

README.md

@@ -19,3 +19,9 @@ The 64bit builds specify use64bitall despite this being largely redundant
 
 The individual Dockerfiles are generated via 'generate.pl', which uses
 Releases.yaml to populate the individual files.
+
+For older versions of Perl, some patches may be necessary to build properly on
+a current base OS.  In those cases, perl -V will show the locally applied patches.
+These changes should be limited to Configure rather than to code itself, and
+will be a cherry pick or back port of a patch from the mainline perl branch
+whenever possible.

Releases.yaml

@@ -1,4 +1,10 @@
 releases:
+  - version: 5.16.3
+    sha1:    060bc17cf9f142d043f9bf7b861422ec624875ea
+    pause:   RJBS
+    extra_flags: "-A ccflags=-fwrapv"
+    test_parallel: no
+
   - version: 5.18.4
     sha1:    69c34558a0a939a7adbbc1de48c06ea418d81e27
     pause:   RJBS

generate.pl

@@ -56,6 +56,26 @@ for my $release (@{$yaml->{releases}}) {
                       ($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/),
                       $config;
 
+    mkdir $dir unless -d $dir;
+
+    # glob switches behavior in scalar context, so force an intermediate
+    # list context so we can get the count
+    if (() = glob "$dir/*.patch") {
+        $output =~ s#{{copy_patches}}#COPY *.patch /usr/src/perl/#;
+        $output =~ s#{{apply_patches}}#cat *.patch | patch -p1#;
+    } else {
+        $output =~ s/{{copy_patches}}\n//mg;
+        $output =~ s/.*{{apply_patches}}.*\n//mg;
+    }
+
+    if (defined $release->{test_parallel} && $release->{test_parallel} eq "no") {
+        $output =~ s/{{test}}/make test_harness/;
+    } elsif (!defined $release->{test_parallel} || $release->{test_parallel} eq "yes") {
+        $output =~ s/{{test}}/TEST_JOBS=\$(nproc) make test_harness/;
+    } else {
+        die "test_parallel was provided for $release->{version} but is invalid; should be 'yes' or 'no'\n";
+    }
+
     open my $dockerfile, ">$dir/Dockerfile" or die "Couldn't open $dir/Dockerfile for writing";
     print $dockerfile $output;
     close $dockerfile;
@@ -80,6 +100,10 @@ each with the following keys:
 
 =over 4
 
+=item REQUIRED
+
+=over 4
+
 =item version
 
 The actual perl version, such as B<5.20.1>.
@@ -92,11 +116,29 @@ The SHA-1 of the C<.tar.bz2> file for that release.
 
 The PAUSE (CPAN user) account that the release was uploaded to.
 
-=item (optionally) extra_args
+=back
+
+=item OPTIONAL
+
+=over 4
+
+=item extra_args
 
 Additional text to pass to C<Configure>.  At the moment, this is necessary for
 5.18.x so that it can get the C<-fwrapv> flag.
 
+Default: C<"">
+
+=item test_parallel
+
+This can be either 'no', 'yes', or unspecified (equivalent to 'yes').
+Added due to dist/IO/t/io_unix.t failing when TEST_JOBS > 1, but should
+only be used in case of a documented issue.
+
+Default: C<yes>
+
+=back
+
 =back
 
 =cut
@@ -110,15 +152,17 @@ RUN apt-get update \
     && rm -fr /var/lib/apt/lists/*
 
 RUN mkdir /usr/src/perl
+{{copy_patches}}
 WORKDIR /usr/src/perl
 
 RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \
     && echo '{{sha1}} *perl-{{version}}.tar.bz2' | sha1sum -c - \
     && tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
     && rm perl-{{version}}.tar.bz2 \
+    && {{apply_patches}} \
     && ./Configure {{args}} {{extra_flags}} -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && {{test}} \
     && make install \
     && cd /usr/src \
     && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \