Rerun of generate.pl
This commit is contained in:
parent
c8a1cb32eb
commit
e5213bc9e0
26 changed files with 100 additions and 236 deletions
|
@ -1,17 +1,3 @@
|
|||
From 6b092e22ef86b15caf724deed2619c330461c3ea Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:35:56 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 182 +++++++++++++++++++++++++++++++++++++++++++++------------
|
||||
hv.c | 26 ++-------
|
||||
patchlevel.h | 1 +
|
||||
perl.c | 2 +-
|
||||
perlio.c | 6 ++
|
||||
t/op/hash.t | 20 ++++++-
|
||||
6 files changed, 175 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index ac264c3..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -446,6 +432,3 @@ index 9bde518..45eb782 100755
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/N/NW/NWCLARK/perl-5.8.9.tar.bz2 -o perl-5.8.9.tar.bz2 \
|
||||
&& echo '19843b5a7585cf35d96c07dbcd419bbdd5813617 *perl-5.8.9.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.8.9.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.8.9.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,17 +1,3 @@
|
|||
From 6b092e22ef86b15caf724deed2619c330461c3ea Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:35:56 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 182 +++++++++++++++++++++++++++++++++++++++++++++------------
|
||||
hv.c | 26 ++-------
|
||||
patchlevel.h | 1 +
|
||||
perl.c | 2 +-
|
||||
perlio.c | 6 ++
|
||||
t/op/hash.t | 20 ++++++-
|
||||
6 files changed, 175 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index ac264c3..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -446,6 +432,3 @@ index 9bde518..45eb782 100755
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/N/NW/NWCLARK/perl-5.8.9.tar.bz2 -o perl-5.8.9.tar.bz2 \
|
||||
&& echo '19843b5a7585cf35d96c07dbcd419bbdd5813617 *perl-5.8.9.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.8.9.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.8.9.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,21 +1,3 @@
|
|||
From c943b5fe69a7cf689217131f90470090ce8e02b8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:00 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
ext/Hash-Util-FieldHash/t/10_hash.t | 18 +++-
|
||||
ext/ODBM_File/hints/linux.pl | 6 +-
|
||||
hints/linux.sh | 189 +++++++++++++++++++++++++++---------
|
||||
hv.c | 26 ++---
|
||||
lib/Archive/Tar/t/02_methods.t | 14 +++
|
||||
make_ext.pl | 4 +
|
||||
patchlevel.h | 1 +
|
||||
perl.c | 2 +-
|
||||
t/op/hash.t | 20 +++-
|
||||
9 files changed, 205 insertions(+), 75 deletions(-)
|
||||
mode change 100755 => 100644 t/op/hash.t
|
||||
|
||||
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
index 29c2f4d..c266b6a 100755
|
||||
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
|
@ -534,6 +516,3 @@ index 9bde518..45eb782
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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.10.1.tar.bz2 -o perl-5.10.1.tar.bz2 \
|
||||
&& echo '98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 *perl-5.10.1.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.10.1.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.10.1.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,21 +1,3 @@
|
|||
From c943b5fe69a7cf689217131f90470090ce8e02b8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:00 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
ext/Hash-Util-FieldHash/t/10_hash.t | 18 +++-
|
||||
ext/ODBM_File/hints/linux.pl | 6 +-
|
||||
hints/linux.sh | 189 +++++++++++++++++++++++++++---------
|
||||
hv.c | 26 ++---
|
||||
lib/Archive/Tar/t/02_methods.t | 14 +++
|
||||
make_ext.pl | 4 +
|
||||
patchlevel.h | 1 +
|
||||
perl.c | 2 +-
|
||||
t/op/hash.t | 20 +++-
|
||||
9 files changed, 205 insertions(+), 75 deletions(-)
|
||||
mode change 100755 => 100644 t/op/hash.t
|
||||
|
||||
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
index 29c2f4d..c266b6a 100755
|
||||
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
|
@ -534,6 +516,3 @@ index 9bde518..45eb782
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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.10.1.tar.bz2 -o perl-5.10.1.tar.bz2 \
|
||||
&& echo '98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 *perl-5.10.1.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.10.1.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.10.1.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,20 +1,3 @@
|
|||
From 145264f14350f778df5efed47ec74d463ad8c941 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:04 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
cpan/Archive-Tar/t/02_methods.t | 14 +++
|
||||
ext/Hash-Util-FieldHash/t/10_hash.t | 18 +++-
|
||||
ext/ODBM_File/hints/linux.pl | 6 +-
|
||||
hints/linux.sh | 166 ++++++++++++++++++++++++++----------
|
||||
hv.c | 26 ++----
|
||||
make_ext.pl | 4 +
|
||||
patchlevel.h | 1 +
|
||||
t/op/hash.t | 20 ++++-
|
||||
8 files changed, 180 insertions(+), 75 deletions(-)
|
||||
mode change 100755 => 100644 t/op/hash.t
|
||||
|
||||
diff --git a/cpan/Archive-Tar/t/02_methods.t b/cpan/Archive-Tar/t/02_methods.t
|
||||
index e400dda..e25e31a 100755
|
||||
--- a/cpan/Archive-Tar/t/02_methods.t
|
||||
|
@ -506,6 +489,3 @@ index 9bde518..45eb782
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/DO/DOM/perl-5.12.5.tar.bz2 -o perl-5.12.5.tar.bz2 \
|
||||
&& echo '812139ceef512eb8458af29ffbf46d78ef26c12a *perl-5.12.5.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.12.5.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.12.5.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,20 +1,3 @@
|
|||
From 145264f14350f778df5efed47ec74d463ad8c941 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:04 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
cpan/Archive-Tar/t/02_methods.t | 14 +++
|
||||
ext/Hash-Util-FieldHash/t/10_hash.t | 18 +++-
|
||||
ext/ODBM_File/hints/linux.pl | 6 +-
|
||||
hints/linux.sh | 166 ++++++++++++++++++++++++++----------
|
||||
hv.c | 26 ++----
|
||||
make_ext.pl | 4 +
|
||||
patchlevel.h | 1 +
|
||||
t/op/hash.t | 20 ++++-
|
||||
8 files changed, 180 insertions(+), 75 deletions(-)
|
||||
mode change 100755 => 100644 t/op/hash.t
|
||||
|
||||
diff --git a/cpan/Archive-Tar/t/02_methods.t b/cpan/Archive-Tar/t/02_methods.t
|
||||
index e400dda..e25e31a 100755
|
||||
--- a/cpan/Archive-Tar/t/02_methods.t
|
||||
|
@ -506,6 +489,3 @@ index 9bde518..45eb782
|
|||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/DO/DOM/perl-5.12.5.tar.bz2 -o perl-5.12.5.tar.bz2 \
|
||||
&& echo '812139ceef512eb8458af29ffbf46d78ef26c12a *perl-5.12.5.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.12.5.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.12.5.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index d0ac9fa..956adfc 100644
|
||||
index d0ac9fa..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
+++ b/hints/linux.sh
|
||||
@@ -39,7 +39,7 @@ i_libutil='undef'
|
||||
|
@ -70,10 +70,27 @@ index d0ac9fa..956adfc 100644
|
|||
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
|
||||
set X $plibpth # Collapse all entries on one line
|
||||
shift
|
||||
@@ -182,6 +178,32 @@ case "$plibpth" in
|
||||
@@ -182,6 +178,49 @@ case "$plibpth" in
|
||||
;;
|
||||
esac
|
||||
|
||||
+# libquadmath is sometimes installed as gcc internal library,
|
||||
+# so contrary to our usual policy of *not* looking at gcc internal
|
||||
+# directories we now *do* look at them, in case they contain
|
||||
+# the quadmath library.
|
||||
+# XXX This may apply to other gcc internal libraries, if such exist.
|
||||
+# XXX This could be at Configure level, but then the $gcc is messy.
|
||||
+case "$usequadmath" in
|
||||
+"$define")
|
||||
+ for d in `LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | cut -f2- -d= | tr ':' $trnl | grep 'gcc' | sed -e 's:/$::'`
|
||||
+ do
|
||||
+ case `ls $d/*libquadmath*$so* 2>/dev/null` in
|
||||
+ $d/*libquadmath*$so*) xlibpth="$xlibpth $d" ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+case "$libc" in
|
||||
+'')
|
||||
+# If you have glibc, then report the version for ./myconfig bug reporting.
|
||||
|
@ -103,7 +120,7 @@ index d0ac9fa..956adfc 100644
|
|||
# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
||||
# for this test.
|
||||
cat >try.c <<'EOM'
|
||||
@@ -202,7 +224,7 @@ main() {
|
||||
@@ -202,7 +241,7 @@ main() {
|
||||
exit(0); /* succeed (yes, it's ELF) */
|
||||
}
|
||||
EOM
|
||||
|
@ -112,7 +129,7 @@ index d0ac9fa..956adfc 100644
|
|||
cat <<'EOM' >&4
|
||||
|
||||
You appear to have ELF support. I'll try to use it for dynamic loading.
|
||||
@@ -268,7 +290,7 @@ fi
|
||||
@@ -268,7 +307,7 @@ fi
|
||||
|
||||
rm -f try.c a.out
|
||||
|
||||
|
@ -121,7 +138,7 @@ index d0ac9fa..956adfc 100644
|
|||
echo ''
|
||||
echo 'You appear to have a working bash. Good.'
|
||||
else
|
||||
@@ -335,7 +357,7 @@ fi
|
||||
@@ -335,7 +374,7 @@ fi
|
||||
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
|
||||
#esac
|
||||
|
||||
|
@ -130,7 +147,7 @@ index d0ac9fa..956adfc 100644
|
|||
sparc*)
|
||||
case "$cccdlflags" in
|
||||
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
|
||||
@@ -350,30 +372,62 @@ esac
|
||||
@@ -350,30 +389,62 @@ esac
|
||||
# version of -lgdbm which is a bad idea. So if we have 'nm'
|
||||
# make sure it can read the file
|
||||
# NI-S 2003/08/07
|
||||
|
@ -210,7 +227,7 @@ index d0ac9fa..956adfc 100644
|
|||
if echo $libswanted | grep -v pthread >/dev/null
|
||||
then
|
||||
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
|
||||
@@ -420,16 +474,6 @@ $define|true|[yY]*)
|
||||
@@ -420,16 +491,6 @@ $define|true|[yY]*)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -227,12 +244,12 @@ index d0ac9fa..956adfc 100644
|
|||
# If using g++, the Configure scan for dlopen() and (especially)
|
||||
# dlerror() might fail, easier just to forcibly hint them in.
|
||||
case "$cc" in
|
||||
@@ -453,7 +497,7 @@ then
|
||||
@@ -453,7 +514,7 @@ then
|
||||
DBLIB="$DBDIR/libdb.so"
|
||||
if [ -f $DBLIB ]
|
||||
then
|
||||
- if nm -u $DBLIB | grep pthread >/dev/null
|
||||
+ if ${nm:-nm} -u $DBLIB | grep pthread >/dev/null
|
||||
+ if ${nm:-nm} -u $DBLIB 2>/dev/null | grep pthread >/dev/null
|
||||
then
|
||||
if ldd $DBLIB | grep pthread >/dev/null
|
||||
then
|
||||
|
@ -251,3 +268,15 @@ index 13a15b4..a564bb3 100644
|
|||
print "\nRunning Makefile.PL in $ext_dir\n";
|
||||
|
||||
# Presumably this can be simplified
|
||||
diff --git a/patchlevel.h b/patchlevel.h
|
||||
index 4d9cd6d..c5ac24a 100644
|
||||
--- a/patchlevel.h
|
||||
+++ b/patchlevel.h
|
||||
@@ -137,6 +137,7 @@ static const char * const local_patches[] = {
|
||||
,"uncommitted-changes"
|
||||
#endif
|
||||
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
|
||||
+ ,"Devel::PatchPerl 1.32"
|
||||
,NULL
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index d0ac9fa..956adfc 100644
|
||||
index d0ac9fa..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
+++ b/hints/linux.sh
|
||||
@@ -39,7 +39,7 @@ i_libutil='undef'
|
||||
|
@ -70,10 +70,27 @@ index d0ac9fa..956adfc 100644
|
|||
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
|
||||
set X $plibpth # Collapse all entries on one line
|
||||
shift
|
||||
@@ -182,6 +178,32 @@ case "$plibpth" in
|
||||
@@ -182,6 +178,49 @@ case "$plibpth" in
|
||||
;;
|
||||
esac
|
||||
|
||||
+# libquadmath is sometimes installed as gcc internal library,
|
||||
+# so contrary to our usual policy of *not* looking at gcc internal
|
||||
+# directories we now *do* look at them, in case they contain
|
||||
+# the quadmath library.
|
||||
+# XXX This may apply to other gcc internal libraries, if such exist.
|
||||
+# XXX This could be at Configure level, but then the $gcc is messy.
|
||||
+case "$usequadmath" in
|
||||
+"$define")
|
||||
+ for d in `LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | cut -f2- -d= | tr ':' $trnl | grep 'gcc' | sed -e 's:/$::'`
|
||||
+ do
|
||||
+ case `ls $d/*libquadmath*$so* 2>/dev/null` in
|
||||
+ $d/*libquadmath*$so*) xlibpth="$xlibpth $d" ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+case "$libc" in
|
||||
+'')
|
||||
+# If you have glibc, then report the version for ./myconfig bug reporting.
|
||||
|
@ -103,7 +120,7 @@ index d0ac9fa..956adfc 100644
|
|||
# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
||||
# for this test.
|
||||
cat >try.c <<'EOM'
|
||||
@@ -202,7 +224,7 @@ main() {
|
||||
@@ -202,7 +241,7 @@ main() {
|
||||
exit(0); /* succeed (yes, it's ELF) */
|
||||
}
|
||||
EOM
|
||||
|
@ -112,7 +129,7 @@ index d0ac9fa..956adfc 100644
|
|||
cat <<'EOM' >&4
|
||||
|
||||
You appear to have ELF support. I'll try to use it for dynamic loading.
|
||||
@@ -268,7 +290,7 @@ fi
|
||||
@@ -268,7 +307,7 @@ fi
|
||||
|
||||
rm -f try.c a.out
|
||||
|
||||
|
@ -121,7 +138,7 @@ index d0ac9fa..956adfc 100644
|
|||
echo ''
|
||||
echo 'You appear to have a working bash. Good.'
|
||||
else
|
||||
@@ -335,7 +357,7 @@ fi
|
||||
@@ -335,7 +374,7 @@ fi
|
||||
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
|
||||
#esac
|
||||
|
||||
|
@ -130,7 +147,7 @@ index d0ac9fa..956adfc 100644
|
|||
sparc*)
|
||||
case "$cccdlflags" in
|
||||
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
|
||||
@@ -350,30 +372,62 @@ esac
|
||||
@@ -350,30 +389,62 @@ esac
|
||||
# version of -lgdbm which is a bad idea. So if we have 'nm'
|
||||
# make sure it can read the file
|
||||
# NI-S 2003/08/07
|
||||
|
@ -210,7 +227,7 @@ index d0ac9fa..956adfc 100644
|
|||
if echo $libswanted | grep -v pthread >/dev/null
|
||||
then
|
||||
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
|
||||
@@ -420,16 +474,6 @@ $define|true|[yY]*)
|
||||
@@ -420,16 +491,6 @@ $define|true|[yY]*)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -227,12 +244,12 @@ index d0ac9fa..956adfc 100644
|
|||
# If using g++, the Configure scan for dlopen() and (especially)
|
||||
# dlerror() might fail, easier just to forcibly hint them in.
|
||||
case "$cc" in
|
||||
@@ -453,7 +497,7 @@ then
|
||||
@@ -453,7 +514,7 @@ then
|
||||
DBLIB="$DBDIR/libdb.so"
|
||||
if [ -f $DBLIB ]
|
||||
then
|
||||
- if nm -u $DBLIB | grep pthread >/dev/null
|
||||
+ if ${nm:-nm} -u $DBLIB | grep pthread >/dev/null
|
||||
+ if ${nm:-nm} -u $DBLIB 2>/dev/null | grep pthread >/dev/null
|
||||
then
|
||||
if ldd $DBLIB | grep pthread >/dev/null
|
||||
then
|
||||
|
@ -251,3 +268,15 @@ index 13a15b4..a564bb3 100644
|
|||
print "\nRunning Makefile.PL in $ext_dir\n";
|
||||
|
||||
# Presumably this can be simplified
|
||||
diff --git a/patchlevel.h b/patchlevel.h
|
||||
index 4d9cd6d..c5ac24a 100644
|
||||
--- a/patchlevel.h
|
||||
+++ b/patchlevel.h
|
||||
@@ -137,6 +137,7 @@ static const char * const local_patches[] = {
|
||||
,"uncommitted-changes"
|
||||
#endif
|
||||
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
|
||||
+ ,"Devel::PatchPerl 1.32"
|
||||
,NULL
|
||||
};
|
||||
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 8826551a8a505d9d3e091aa31943d0fc6ef92cba Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:13 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 145 +++++++++++++++++++++++++++++++++++++++++----------------
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 107 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index 688c68d..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -261,6 +251,3 @@ index be508d1..11ae2e8 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/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 DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 8826551a8a505d9d3e091aa31943d0fc6ef92cba Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:13 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 145 +++++++++++++++++++++++++++++++++++++++++----------------
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 107 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index 688c68d..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -261,6 +251,3 @@ index be508d1..11ae2e8 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/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 DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 6509088d78a8d7e1e04b224f4058d74d2d147075 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:18 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 135 ++++++++++++++++++++++++++++++++++++++++++++-------------
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 107 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index a148248..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -244,6 +234,3 @@ index cb033ea..1318325 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \
|
||||
&& echo '69c34558a0a939a7adbbc1de48c06ea418d81e27 *perl-5.18.4.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.18.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 \
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 6509088d78a8d7e1e04b224f4058d74d2d147075 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:18 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 135 ++++++++++++++++++++++++++++++++++++++++++++-------------
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 107 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index a148248..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -244,6 +234,3 @@ index cb033ea..1318325 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \
|
||||
&& echo '69c34558a0a939a7adbbc1de48c06ea418d81e27 *perl-5.18.4.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.18.4.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 5d5851601cb066f11ce5c132bb40ec63408e5fe2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:23 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 19 ++++++++++++++++++-
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index 956adfc..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -57,6 +47,3 @@ index 07e1217..8016ec8 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/S/SH/SHAY/perl-5.20.2.tar.bz2 -o perl-5.20.2.tar.bz2 \
|
||||
&& echo '63126c683b4c79c35008a47d56f7beae876c569f *perl-5.20.2.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.20.2.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.20.2.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Dusethreads -Duse64bitall -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
From 5d5851601cb066f11ce5c132bb40ec63408e5fe2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Martini <PeterCMartini@GMail.com>
|
||||
Date: Wed, 15 Apr 2015 22:36:23 -0400
|
||||
Subject: [PATCH] tmp
|
||||
|
||||
---
|
||||
hints/linux.sh | 19 ++++++++++++++++++-
|
||||
patchlevel.h | 1 +
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
||||
index 956adfc..fb5a46e 100644
|
||||
--- a/hints/linux.sh
|
||||
|
@ -57,6 +47,3 @@ index 07e1217..8016ec8 100644
|
|||
,NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
@ -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/S/SH/SHAY/perl-5.20.2.tar.bz2 -o perl-5.20.2.tar.bz2 \
|
||||
&& echo '63126c683b4c79c35008a47d56f7beae876c569f *perl-5.20.2.tar.bz2' | sha1sum -c - \
|
||||
&& tar --strip-components=1 -xjf perl-5.20.2.tar.bz2 -C /usr/src/perl \
|
||||
&& rm perl-5.20.2.tar.bz2 \
|
||||
&& cat DevelPatchPerl.patch | patch -p1 \
|
||||
&& cat *.patch | patch -p1 \
|
||||
&& ./Configure -Duse64bitall -des \
|
||||
&& make -j$(nproc) \
|
||||
&& make test_harness \
|
||||
|
|
Loading…
Add table
Reference in a new issue