Remove generated directories
This commit is contained in:
parent
22b93e41f0
commit
00c709ff12
428 changed files with 0 additions and 43584 deletions
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,281 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 438b926..a762f78 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4591,7 +4591,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4631,7 +4631,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5328,13 +5328,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5343,7 +5343,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5445,7 +5445,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index 956adfc..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,33 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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.
|
|
||||||
@@ -204,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
@@ -497,7 +441,7 @@ then
|
|
||||||
DBLIB="$DBDIR/libdb.so"
|
|
||||||
if [ -f $DBLIB ]
|
|
||||||
then
|
|
||||||
- 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
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 4ec6887..729239c 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3435,8 +3435,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
|
|
||||||
&& echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
|
|
||||||
&& rm perl-5.20.3.tar.bz2 \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.20.3","-de0"]
|
|
|
@ -1,41 +0,0 @@
|
||||||
From a2db6c92fc2880ba1f288b6c4599a779997dd4e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tony Cook <tony@develop-help.com>
|
|
||||||
Date: Thu, 9 Apr 2015 15:45:16 +1000
|
|
||||||
Subject: [PATCH] [perl #123971] fix long double pack padding on newer GCC
|
|
||||||
|
|
||||||
---
|
|
||||||
pp_pack.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pp_pack.c b/pp_pack.c
|
|
||||||
index 06adade..1d732a8 100644
|
|
||||||
--- a/pp_pack.c
|
|
||||||
+++ b/pp_pack.c
|
|
||||||
@@ -2709,6 +2709,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
#ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
anv.nv = sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(anv.bytes+10, sizeof(anv.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
anv.nv = SvNV(fromstr);
|
|
||||||
#endif
|
|
||||||
@@ -2726,6 +2732,11 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
|
|
||||||
# ifdef __GNUC__
|
|
||||||
/* to work round a gcc/x86 bug; don't use SvNV */
|
|
||||||
aldouble.ld = (long double)sv_2nv(fromstr);
|
|
||||||
+# if defined(USE_LONG_DOUBLE)
|
|
||||||
+ /* GCC sometimes overwrites the padding in the
|
|
||||||
+ assignment above */
|
|
||||||
+ Zero(aldouble.bytes+10, sizeof(aldouble.bytes) - 10, U8);
|
|
||||||
+# endif
|
|
||||||
# else
|
|
||||||
aldouble.ld = (long double)SvNV(fromstr);
|
|
||||||
# endif
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:bullseye-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
|
@ -1,264 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 5f5f279..8ce5cbb 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -4658,7 +4658,7 @@ else
|
|
||||||
fi
|
|
||||||
$rm -f try try.*
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
'') gccosandvers='' ;;
|
|
||||||
@@ -4698,7 +4698,7 @@ esac
|
|
||||||
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
||||||
# so we will take those off from locincpth.
|
|
||||||
case "$gccversion" in
|
|
||||||
-3*)
|
|
||||||
+3.*)
|
|
||||||
echo "main(){}">try.c
|
|
||||||
for incdir in $locincpth; do
|
|
||||||
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
||||||
@@ -5410,13 +5410,13 @@ fi
|
|
||||||
case "$hint" in
|
|
||||||
default|recommended)
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
||||||
esac
|
|
||||||
case "$optimize:$DEBUGGING" in
|
|
||||||
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
||||||
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
# Interactive Systems (ISC) POSIX mode.
|
|
||||||
@@ -5425,7 +5425,7 @@ default|recommended)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
- 1*) ;;
|
|
||||||
+ 1.*) ;;
|
|
||||||
2.[0-8]*) ;;
|
|
||||||
?*) set strict-aliasing -fno-strict-aliasing
|
|
||||||
eval $checkccflag
|
|
||||||
@@ -5534,7 +5534,7 @@ case "$cppflags" in
|
|
||||||
*) cppflags="$cppflags $ccflags" ;;
|
|
||||||
esac
|
|
||||||
case "$gccversion" in
|
|
||||||
-1*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
||||||
esac
|
|
||||||
case "$mips_type" in
|
|
||||||
'');;
|
|
||||||
@@ -23010,7 +23010,7 @@ fi
|
|
||||||
|
|
||||||
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
||||||
case "$gccversion" in
|
|
||||||
-[45].*) case "$optimize$ccflags" in
|
|
||||||
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
||||||
*-O*) case "$ccflags$cppsymbols" in
|
|
||||||
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
||||||
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
||||||
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
||||||
index 472e71a..0a852a0 100644
|
|
||||||
--- a/cpan/Time-Local/t/Local.t
|
|
||||||
+++ b/cpan/Time-Local/t/Local.t
|
|
||||||
@@ -91,7 +91,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timelocal()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = localtime($time);
|
|
||||||
@@ -107,7 +107,7 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
# Test timegm()
|
|
||||||
{
|
|
||||||
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
||||||
+ my $year_in = $year + 1900;
|
|
||||||
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
|
|
||||||
|
|
||||||
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
|
|
||||||
@@ -125,7 +125,6 @@ for (@time, @neg_time) {
|
|
||||||
|
|
||||||
for (@bad_time) {
|
|
||||||
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
|
|
||||||
- $year -= 1900;
|
|
||||||
$mon--;
|
|
||||||
|
|
||||||
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
|
|
||||||
@@ -134,14 +133,14 @@ for (@bad_time) {
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
|
|
||||||
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
|
|
||||||
'one hour difference between two calls to timelocal');
|
|
||||||
|
|
||||||
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
|
|
||||||
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
|
|
||||||
'one day difference between two calls to timelocal');
|
|
||||||
|
|
||||||
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
|
|
||||||
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
|
|
||||||
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
|
|
||||||
'60 day difference between two calls to timegm');
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
||||||
index fb5a46e..c749f0f 100644
|
|
||||||
--- a/hints/linux.sh
|
|
||||||
+++ b/hints/linux.sh
|
|
||||||
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
||||||
|
|
||||||
# Check if we're about to use Intel's ICC compiler
|
|
||||||
case "`${cc:-cc} -V 2>&1`" in
|
|
||||||
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
||||||
+*"Intel(R) C"*" Compiler"*)
|
|
||||||
# record the version, formats:
|
|
||||||
# icc (ICC) 10.1 20080801
|
|
||||||
# icpc (ICC) 10.1 20080801
|
|
||||||
@@ -165,6 +165,9 @@ esac
|
|
||||||
# plibpth to bypass this check.
|
|
||||||
if [ -x /usr/bin/gcc ] ; then
|
|
||||||
gcc=/usr/bin/gcc
|
|
||||||
+# clang also provides -print-search-dirs
|
|
||||||
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
||||||
+ gcc=${cc:-cc}
|
|
||||||
else
|
|
||||||
gcc=gcc
|
|
||||||
fi
|
|
||||||
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
||||||
+# available functions, like memem, won't be used. See the discussion in
|
|
||||||
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
||||||
+# at least on alpine linux, the ldd --version output contains the
|
|
||||||
+# string 'musl.'
|
|
||||||
+case `ldd --version 2>&1` in
|
|
||||||
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
||||||
+ *) ;;
|
|
||||||
+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
|
|
||||||
@@ -221,92 +234,6 @@ case "$libc" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
|
||||||
-# for this test.
|
|
||||||
-cat >try.c <<'EOM'
|
|
||||||
-/* Test for whether ELF binaries are produced */
|
|
||||||
-#include <fcntl.h>
|
|
||||||
-#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
-main() {
|
|
||||||
- char buffer[4];
|
|
||||||
- int i=open("a.out",O_RDONLY);
|
|
||||||
- if(i==-1)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(read(i,&buffer[0],4)<4)
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- if(buffer[0] != 127 || buffer[1] != 'E' ||
|
|
||||||
- buffer[2] != 'L' || buffer[3] != 'F')
|
|
||||||
- exit(1); /* fail */
|
|
||||||
- exit(0); /* succeed (yes, it's ELF) */
|
|
||||||
-}
|
|
||||||
-EOM
|
|
||||||
-if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You appear to have ELF support. I'll try to use it for dynamic loading.
|
|
||||||
-If dynamic loading doesn't work, read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
- cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-You don't have an ELF gcc. I will use dld if possible. If you are
|
|
||||||
-using a version of DLD earlier than 3.2.6, or don't have it at all, you
|
|
||||||
-should probably upgrade. If you are forced to use 3.2.4, you should
|
|
||||||
-uncomment a couple of lines in hints/linux.sh and restart Configure so
|
|
||||||
-that shared libraries will be disallowed.
|
|
||||||
-
|
|
||||||
-EOM
|
|
||||||
- lddlflags="-r $lddlflags"
|
|
||||||
- # These empty values are so that Configure doesn't put in the
|
|
||||||
- # Linux ELF values.
|
|
||||||
- ccdlflags=' '
|
|
||||||
- cccdlflags=' '
|
|
||||||
- ccflags="-DOVR_DBL_DIG=14 $ccflags"
|
|
||||||
- so='sa'
|
|
||||||
- dlext='o'
|
|
||||||
- nm_so_opt=' '
|
|
||||||
- ## If you are using DLD 3.2.4 which does not support shared libs,
|
|
||||||
- ## uncomment the next two lines:
|
|
||||||
- #ldflags="-static"
|
|
||||||
- #so='none'
|
|
||||||
-
|
|
||||||
- # In addition, on some systems there is a problem with perl and NDBM
|
|
||||||
- # which causes AnyDBM and NDBM_File to lock up. This is evidenced
|
|
||||||
- # in the tests as AnyDBM just freezing. Apparently, this only
|
|
||||||
- # happens on a.out systems, so we disable NDBM for all a.out linux
|
|
||||||
- # systems. If someone can suggest a more robust test
|
|
||||||
- # that would be appreciated.
|
|
||||||
- #
|
|
||||||
- # More info:
|
|
||||||
- # Date: Wed, 7 Feb 1996 03:21:04 +0900
|
|
||||||
- # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>
|
|
||||||
- #
|
|
||||||
- # I tried compiling with DBM support and sure enough things locked up
|
|
||||||
- # just as advertised. Checking into it, I found that the lockup was
|
|
||||||
- # during the call to dbm_open. Not *in* dbm_open -- but between the call
|
|
||||||
- # to and the jump into.
|
|
||||||
- #
|
|
||||||
- # To make a long story short, making sure that the *.a and *.sa pairs of
|
|
||||||
- # /usr/lib/lib{m,db,gdbm}.{a,sa}
|
|
||||||
- # were perfectly in sync took care of it.
|
|
||||||
- #
|
|
||||||
- # This will generate a harmless Whoa There! message
|
|
||||||
- case "$d_dbm_open" in
|
|
||||||
- '') cat <<'EOM' >&4
|
|
||||||
-
|
|
||||||
-Disabling ndbm. This will generate a Whoa There message in Configure.
|
|
||||||
-Read hints/linux.sh for further information.
|
|
||||||
-EOM
|
|
||||||
- # You can override this with Configure -Dd_dbm_open
|
|
||||||
- d_dbm_open=undef
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-rm -f try.c a.out
|
|
||||||
-
|
|
||||||
if ${sh:-/bin/sh} -c exit; then
|
|
||||||
echo ''
|
|
||||||
echo 'You appear to have a working bash. Good.'
|
|
||||||
diff --git a/pp.c b/pp.c
|
|
||||||
index 3173c5a..f2a37bd 100644
|
|
||||||
--- a/pp.c
|
|
||||||
+++ b/pp.c
|
|
||||||
@@ -3624,8 +3624,12 @@ PP(pp_crypt)
|
|
||||||
#if defined(__GLIBC__) || defined(__EMX__)
|
|
||||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
||||||
- /* work around glibc-2.2.5 bug */
|
|
||||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
||||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
||||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
||||||
+ * time in glibc-2.3.X */
|
|
||||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM debian:buster-backports
|
|
||||||
LABEL maintainer="Ryan Voots <simcop@cpan.org>"
|
|
||||||
|
|
||||||
COPY *.patch /usr/src/perl/
|
|
||||||
WORKDIR /usr/src/perl
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
|
|
||||||
&& apt update \
|
|
||||||
&& apt -yq full-upgrade \
|
|
||||||
&& apt -yq build-dep perl \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
|
||||||
# cpio \
|
|
||||||
curl \
|
|
||||||
dpkg-dev \
|
|
||||||
# file \
|
|
||||||
gcc \
|
|
||||||
# g++ \
|
|
||||||
libbz2-dev \
|
|
||||||
libdb-dev \
|
|
||||||
libc6-dev \
|
|
||||||
libgdbm-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
make \
|
|
||||||
netbase \
|
|
||||||
patch \
|
|
||||||
procps \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
&& curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
|
|
||||||
&& echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
|
|
||||||
RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
|
|
||||||
&& rm perl-5.22.4.tar.xz \
|
|
||||||
&& cat *.patch | patch -p1 \
|
|
||||||
&& echo 'print "1..0 # Skipped: Tests are invalid"' > /usr/src/perl/ext/GDBM_File/t/fatal.t
|
|
||||||
RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
|
|
||||||
&& archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
|
|
||||||
&& archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
|
|
||||||
&& ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib -des \
|
|
||||||
&& make -j$(nproc) \
|
|
||||||
&& TEST_JOBS=$(nproc) make test_harness
|
|
||||||
RUN make install \
|
|
||||||
&& cd /usr/src \
|
|
||||||
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
|
|
||||||
&& echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
|
|
||||||
&& tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
|
|
||||||
&& savedPackages="make netbase" \
|
|
||||||
&& apt-mark auto '.*' > /dev/null \
|
|
||||||
&& apt-mark manual $savedPackages \
|
|
||||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
|
||||||
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
|
|
||||||
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
|
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
CMD ["perl5.22.4","-de0"]
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue