Skip to content

Commit 5a9cbc4

Browse files
PeterMartiniPeterMartini
committed
Split modified DevelPatchPerl into two patches
1 parent fa0cd96 commit 5a9cbc4

File tree

6 files changed

+52
-52
lines changed

6 files changed

+52
-52
lines changed

‎5.014.004-64bit,threaded/DevelPatchPerl.patch

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -251,27 +251,3 @@ index 13a15b4..a564bb3 100644
251251
print "\nRunning Makefile.PL in $ext_dir\n";
252252

253253
# Presumably this can be simplified
254-
diff --git a/Configure b/Configure
255-
index a780b81..3ae16ca 100755
256-
--- a/Configure
257-
+++ b/Configure
258-
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
259-
EOSH
260-
chmod +x Cppsym.try
261-
$eunicefix Cppsym.try
262-
-./Cppsym < Cppsym.know > Cppsym.true
263-
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
264-
: Add in any linux cpp "predefined macros":
265-
case "$osname::$gccversion" in
266-
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
267-
tHdrH=_tmpHdr
268-
rm -f $tHdrH'.h' $tHdrH
269-
touch $tHdrH'.h'
270-
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
271-
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
272-
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
273-
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
274-
if [ -s $tHdrH'_cppsym.real' ]; then
275-
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
276-
fi
277-

‎5.014.004-64bit,threaded/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ RUN apt-get update \
66
&& rm -fr /var/lib/apt/lists/*
77

88
RUN mkdir /usr/src/perl
9-
COPY DevelPatchPerl.patch /usr/src/perl/
9+
COPY *.patch /usr/src/perl/
1010
WORKDIR /usr/src/perl
1111

1212
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 \
1313
&& echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
1414
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
1515
&& rm perl-5.14.4.tar.bz2 \
16-
&& cat DevelPatchPerl.patch | patch -p1 \
16+
&& cat *.patch | patch -p1 \
1717
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
1818
&& make -j$(nproc) \
1919
&& make test_harness \

‎5.014.004-64bit,threaded/fix-h2ph-test-failure.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/Configure b/Configure
2+
index a780b81..3ae16ca 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
6+
EOSH
7+
chmod +x Cppsym.try
8+
$eunicefix Cppsym.try
9+
-./Cppsym < Cppsym.know > Cppsym.true
10+
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
11+
: Add in any linux cpp "predefined macros":
12+
case "$osname::$gccversion" in
13+
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
14+
tHdrH=_tmpHdr
15+
rm -f $tHdrH'.h' $tHdrH
16+
touch $tHdrH'.h'
17+
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
18+
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
19+
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
20+
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
21+
if [ -s $tHdrH'_cppsym.real' ]; then
22+
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
23+
fi
24+

‎5.014.004-64bit/DevelPatchPerl.patch

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -251,27 +251,3 @@ index 13a15b4..a564bb3 100644
251251
print "\nRunning Makefile.PL in $ext_dir\n";
252252

253253
# Presumably this can be simplified
254-
diff --git a/Configure b/Configure
255-
index a780b81..3ae16ca 100755
256-
--- a/Configure
257-
+++ b/Configure
258-
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
259-
EOSH
260-
chmod +x Cppsym.try
261-
$eunicefix Cppsym.try
262-
-./Cppsym < Cppsym.know > Cppsym.true
263-
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
264-
: Add in any linux cpp "predefined macros":
265-
case "$osname::$gccversion" in
266-
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
267-
tHdrH=_tmpHdr
268-
rm -f $tHdrH'.h' $tHdrH
269-
touch $tHdrH'.h'
270-
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
271-
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
272-
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
273-
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
274-
if [ -s $tHdrH'_cppsym.real' ]; then
275-
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
276-
fi
277-

‎5.014.004-64bit/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ RUN apt-get update \
66
&& rm -fr /var/lib/apt/lists/*
77

88
RUN mkdir /usr/src/perl
9-
COPY DevelPatchPerl.patch /usr/src/perl/
9+
COPY *.patch /usr/src/perl/
1010
WORKDIR /usr/src/perl
1111

1212
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 \
1313
&& echo '3527c9e26f985cba98796439bf555fde8be73cdf *perl-5.14.4.tar.bz2' | sha1sum -c - \
1414
&& tar --strip-components=1 -xjf perl-5.14.4.tar.bz2 -C /usr/src/perl \
1515
&& rm perl-5.14.4.tar.bz2 \
16-
&& cat DevelPatchPerl.patch | patch -p1 \
16+
&& cat *.patch | patch -p1 \
1717
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
1818
&& make -j$(nproc) \
1919
&& make test_harness \

‎5.014.004-64bit/fix-h2ph-test-failure.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/Configure b/Configure
2+
index a780b81..3ae16ca 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -21633,15 +21633,16 @@ $cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $r
6+
EOSH
7+
chmod +x Cppsym.try
8+
$eunicefix Cppsym.try
9+
-./Cppsym < Cppsym.know > Cppsym.true
10+
+./Cppsym < Cppsym.know | $sort | $uniq > Cppsym.true
11+
: Add in any linux cpp "predefined macros":
12+
case "$osname::$gccversion" in
13+
*linux*::*.*|*gnukfreebsd*::*.*|gnu::*.*)
14+
tHdrH=_tmpHdr
15+
rm -f $tHdrH'.h' $tHdrH
16+
touch $tHdrH'.h'
17+
+ # Filter out macro arguments, such as Linux's __INT8_C(c)
18+
if $cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ]; then
19+
- sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
20+
+ sed -e 's/#define[\ \ ]*//;s/[\ \ ].*$//' -e 's/(.*//' <$tHdrH'_cppsym.h' >$tHdrH'_cppsym.real'
21+
if [ -s $tHdrH'_cppsym.real' ]; then
22+
cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
23+
fi
24+

0 commit comments

Comments
 (0)