From 5a9cbc47dee3c0fadee8aaa4128961b46e9eb050 Mon Sep 17 00:00:00 2001
From: Peter Martini <PeterCMartini@GMail.com>
Date: Sun, 3 May 2015 12:07:11 -0400
Subject: [PATCH] Split modified DevelPatchPerl into two patches

---
 5.014.004-64bit,threaded/DevelPatchPerl.patch | 24 -------------------
 5.014.004-64bit,threaded/Dockerfile           |  4 ++--
 .../fix-h2ph-test-failure.patch               | 24 +++++++++++++++++++
 5.014.004-64bit/DevelPatchPerl.patch          | 24 -------------------
 5.014.004-64bit/Dockerfile                    |  4 ++--
 5.014.004-64bit/fix-h2ph-test-failure.patch   | 24 +++++++++++++++++++
 6 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 5.014.004-64bit,threaded/fix-h2ph-test-failure.patch
 create mode 100644 5.014.004-64bit/fix-h2ph-test-failure.patch

diff --git a/5.014.004-64bit,threaded/DevelPatchPerl.patch b/5.014.004-64bit,threaded/DevelPatchPerl.patch
index a9fe8f2..995175a 100644
--- a/5.014.004-64bit,threaded/DevelPatchPerl.patch
+++ b/5.014.004-64bit,threaded/DevelPatchPerl.patch
@@ -251,27 +251,3 @@ index 13a15b4..a564bb3 100644
  	print "\nRunning Makefile.PL in $ext_dir\n";
  
  	# Presumably this can be simplified
-diff --git a/Configure b/Configure
-index a780b81..3ae16ca 100755
---- a/Configure
-+++ b/Configure
-@@ -21633,15 +21633,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
-
diff --git a/5.014.004-64bit,threaded/Dockerfile b/5.014.004-64bit,threaded/Dockerfile
index afc9fee..4633d0b 100644
--- a/5.014.004-64bit,threaded/Dockerfile
+++ b/5.014.004-64bit,threaded/Dockerfile
@@ -6,14 +6,14 @@ RUN apt-get update \
     && rm -fr /var/lib/apt/lists/*
 
 RUN mkdir /usr/src/perl
-COPY DevelPatchPerl.patch /usr/src/perl/
+COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 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 \
     && echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
     && tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.14.4.tar.bz2 \
-    && cat DevelPatchPerl.patch | patch -p1 \
+    && cat *.patch | patch -p1 \
     && ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
     && make -j$(nproc) \
     && make test_harness \
diff --git a/5.014.004-64bit,threaded/fix-h2ph-test-failure.patch b/5.014.004-64bit,threaded/fix-h2ph-test-failure.patch
new file mode 100644
index 0000000..d26732a
--- /dev/null
+++ b/5.014.004-64bit,threaded/fix-h2ph-test-failure.patch
@@ -0,0 +1,24 @@
+diff --git a/Configure b/Configure
+index a780b81..3ae16ca 100755
+--- a/Configure
++++ b/Configure
+@@ -21633,15 +21633,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
+
diff --git a/5.014.004-64bit/DevelPatchPerl.patch b/5.014.004-64bit/DevelPatchPerl.patch
index a9fe8f2..995175a 100644
--- a/5.014.004-64bit/DevelPatchPerl.patch
+++ b/5.014.004-64bit/DevelPatchPerl.patch
@@ -251,27 +251,3 @@ index 13a15b4..a564bb3 100644
  	print "\nRunning Makefile.PL in $ext_dir\n";
  
  	# Presumably this can be simplified
-diff --git a/Configure b/Configure
-index a780b81..3ae16ca 100755
---- a/Configure
-+++ b/Configure
-@@ -21633,15 +21633,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
-
diff --git a/5.014.004-64bit/Dockerfile b/5.014.004-64bit/Dockerfile
index 9dce359..4330256 100644
--- a/5.014.004-64bit/Dockerfile
+++ b/5.014.004-64bit/Dockerfile
@@ -6,14 +6,14 @@ RUN apt-get update \
     && rm -fr /var/lib/apt/lists/*
 
 RUN mkdir /usr/src/perl
-COPY DevelPatchPerl.patch /usr/src/perl/
+COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 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 \
     && echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
     && tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.14.4.tar.bz2 \
-    && cat DevelPatchPerl.patch | patch -p1 \
+    && cat *.patch | patch -p1 \
     && ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
     && make -j$(nproc) \
     && make test_harness \
diff --git a/5.014.004-64bit/fix-h2ph-test-failure.patch b/5.014.004-64bit/fix-h2ph-test-failure.patch
new file mode 100644
index 0000000..d26732a
--- /dev/null
+++ b/5.014.004-64bit/fix-h2ph-test-failure.patch
@@ -0,0 +1,24 @@
+diff --git a/Configure b/Configure
+index a780b81..3ae16ca 100755
+--- a/Configure
++++ b/Configure
+@@ -21633,15 +21633,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
+