amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Perl: Update to 5.32.0.

Browse source 
* gnu/packages/perl.scm (perl): Update to 5.32.0.
[source](patches): Remove obsolete patch.
* gnu/packages/patches/perl-no-sys-dirs.patch: Adjust for upstream changes.
* gnu/packages/patches/perl-deterministic-ordering.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
This commit is contained in:
Marius Bakke 2020-12-15 22:41:04 +01:00
parent ac2186401d
commit 3839b5d536
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 51 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1447,7 +1447,6 @@ dist_patch_DATA = \
%D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-cross.patch \ %D%/packages/patches/perl-cross.patch \
%D%/packages/patches/perl-deterministic-ordering.patch \
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
%D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \ %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \ %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \

29
gnu/packages/patches/perl-deterministic-ordering.patch
View file

@ -1,29 +0,0 @@
From <https://bugs.debian.org/801523>.
From c01f602d1926b0671fd2c8d91f7e52c4e4c9fb24 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sun, 11 Oct 2015 19:27:56 +0300
Subject: [PATCH] Sort the list of XS code files when generating RealPPPort.xs
all_files_in_dir() uses readdir() ordering to make the list of
input files. This can vary between build systems, breaking build
reproducibility.
---
cpan/Devel-PPPort/PPPort_xs.PL | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist/Devel-PPPort/PPPort_xs.PL b/dist/Devel-PPPort/PPPort_xs.PL
index 5f18940..149f2fe 100644
--- a/dist/Devel-PPPort/PPPort_xs.PL
+++ b/dist/Devel-PPPort/PPPort_xs.PL
@@ -38,7 +38,7 @@ END
my $file;
my $sec;
-for $file (all_files_in_dir('parts/inc')) {
+for $file (sort(all_files_in_dir('parts/inc'))) {
my $spec = parse_partspec($file);
my $msg = 0;
--
2.5.1

99
gnu/packages/patches/perl-no-sys-dirs.patch
View file

@ -6,7 +6,7 @@ Patch adapted from Nixpkgs, originally by Eelco Dolstra
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 --- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200
+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200
@@ -106,15 +106,7 @@ @@ -108,15 +108,7 @@
fi fi
: Proper PATH setting : Proper PATH setting
@ -23,8 +23,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
for p in $paths for p in $paths
do do
@@ -1337,8 +1329,7 @@ @@ -1435,8 +1427,7 @@
archname='' i_whoami=''
: Possible local include directories to search. : Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches. : Set locincpth to "" in a hint file to defeat local include searches.
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
@ -33,8 +33,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
: :
: no include file wanted by default : no include file wanted by default
inclwanted='' inclwanted=''
@@ -1349,17 +1340,12 @@ @@ -1450,17 +1441,12 @@
archobjs=''
libnames='' libnames=''
: change the next line if compiling for Xenix/286 on Xenix/386 : change the next line if compiling for Xenix/286 on Xenix/386
-xlibpth='/usr/lib/386 /lib/386' -xlibpth='/usr/lib/386 /lib/386'
@ -54,8 +54,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
: Private path used by Configure to find libraries. Its value : Private path used by Configure to find libraries. Its value
: is prepended to libpth. This variable takes care of special : is prepended to libpth. This variable takes care of special
@@ -1391,8 +1377,6 @@ @@ -1495,8 +1481,6 @@
libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
: We probably want to search /usr/shlib before most other libraries. : We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` -glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@ -63,7 +63,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
: Do not use vfork unless overridden by a hint file. : Do not use vfork unless overridden by a hint file.
usevfork=false usevfork=false
@@ -2446,7 +2430,6 @@ @@ -2553,7 +2537,6 @@
zip zip
" "
pth=`echo $PATH | sed -e "s/$p_/ /g"` pth=`echo $PATH | sed -e "s/$p_/ /g"`
@ -71,7 +71,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
for file in $loclist; do for file in $loclist; do
eval xxx=\$$file eval xxx=\$$file
case "$xxx" in case "$xxx" in
@@ -4936,7 +4919,7 @@ @@ -5049,7 +5033,7 @@
: Set private lib path : Set private lib path
case "$plibpth" in case "$plibpth" in
'') if ./mips; then '') if ./mips; then
@ -80,7 +80,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
fi;; fi;;
esac esac
case "$libpth" in case "$libpth" in
@@ -8600,13 +8583,8 @@ @@ -8877,13 +8861,8 @@
echo " " echo " "
case "$sysman" in case "$sysman" in
'') '')
@ -96,7 +96,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
;; ;;
esac esac
if $test -d "$sysman"; then if $test -d "$sysman"; then
@@ -19900,9 +19878,10 @@ @@ -21027,9 +21006,10 @@
case "$full_ar" in case "$full_ar" in
'') full_ar=$ar ;; '') full_ar=$ar ;;
esac esac
@ -169,7 +169,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 --- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200
+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200
@@ -150,25 +150,6 @@ @@ -150,28 +150,6 @@
;; ;;
esac esac
@ -188,6 +188,9 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
-# plibpth to bypass this check. -# plibpth to bypass this check.
-if [ -x /usr/bin/gcc ] ; then -if [ -x /usr/bin/gcc ] ; then
- gcc=/usr/bin/gcc - 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 -else
- gcc=gcc - gcc=gcc
-fi -fi
@ -195,7 +198,40 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
case "$plibpth" in case "$plibpth" in
'') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
@@ -367,33 +322,6 @@ @@ -208,32 +186,6 @@
;;
esac
-case "$libc" in
-'')
-# If you have glibc, then report the version for ./myconfig bug reporting.
-# (Configure doesn't need to know the specific version since it just uses
-# gcc to load the library for all tests.)
-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
-# are insufficiently precise to distinguish things like
-# libc-2.0.6 and libc-2.0.7.
- for p in $plibpth
- do
- for trylib in libc.so.6 libc.so
- do
- if $test -e $p/$trylib; then
- libc=`ls -l $p/$trylib | awk '{print $NF}'`
- if $test "X$libc" != X; then
- break
- fi
- fi
- done
- if $test "X$libc" != X; then
- break
- fi
- done
- ;;
-esac
-
if ${sh:-/bin/sh} -c exit; then
echo ''
echo 'You appear to have a working bash. Good.'
@@ -311,33 +263,6 @@
;; ;;
esac esac
@ -229,40 +265,3 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
# Linux on Synology. # Linux on Synology.
if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
# Tested on Synology DS213 and DS413 # Tested on Synology DS213 and DS413
diff --git a/hints/linux.sh b/hints/linux.sh
index 3f38ea0..97aed11 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -195,32 +195,6 @@ case "$usequadmath" in
;;
esac
-case "$libc" in
-'')
-# If you have glibc, then report the version for ./myconfig bug reporting.
-# (Configure doesn't need to know the specific version since it just uses
-# gcc to load the library for all tests.)
-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
-# are insufficiently precise to distinguish things like
-# libc-2.0.6 and libc-2.0.7.
- for p in $plibpth
- do
- for trylib in libc.so.6 libc.so
- do
- if $test -e $p/$trylib; then
- libc=`ls -l $p/$trylib | awk '{print $NF}'`
- if $test "X$libc" != X; then
- break
- fi
- fi
- done
- if $test "X$libc" != X; then
- break
- fi
- done
- ;;
-esac
-
if ${sh:-/bin/sh} -c exit; then
echo ''
echo 'You appear to have a working bash. Good.'

5
gnu/packages/perl.scm
View file

@ -87,18 +87,17 @@
;; Yeah, Perl... It is required early in the bootstrap process by Linux. ;; Yeah, Perl... It is required early in the bootstrap process by Linux.
(package (package
(name "perl") (name "perl")
(version "5.30.2") (version "5.32.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/src/5.0/perl-" (uri (string-append "mirror://cpan/src/5.0/perl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6")) "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg"))
(patches (search-patches (patches (search-patches
"perl-no-sys-dirs.patch" "perl-no-sys-dirs.patch"
"perl-autosplit-default-time.patch" "perl-autosplit-default-time.patch"
"perl-deterministic-ordering.patch"
"perl-reproducible-build-date.patch")))) "perl-reproducible-build-date.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments