guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/09: gnu: perl: Update to 5.30.0.


From: guix-commits
Subject: 02/09: gnu: perl: Update to 5.30.0.
Date: Sun, 26 May 2019 13:50:49 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit a3e53041b87932e2a44b109d7f28cc331bc5021b
Author: Marius Bakke <address@hidden>
Date:   Thu May 23 18:14:01 2019 +0200

    gnu: perl: Update to 5.30.0.
    
    * gnu/packages/patches/perl-no-sys-dirs.patch: Adjust Errno.h hunk.
    * gnu/packages/perl.scm (perl): Update to 5.30.0.
---
 gnu/packages/patches/perl-no-sys-dirs.patch | 23 ++++++++++++++++-------
 gnu/packages/perl.scm                       |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/patches/perl-no-sys-dirs.patch 
b/gnu/packages/patches/perl-no-sys-dirs.patch
index 31d53e0..2269d71 100644
--- a/gnu/packages/patches/perl-no-sys-dirs.patch
+++ b/gnu/packages/patches/perl-no-sys-dirs.patch
@@ -112,20 +112,29 @@ Only in perl-5.20.0/: Configure.orig
 diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL 
perl-5.20.0/ext/Errno/Errno_pm.PL
 --- perl-5.20.0-orig/ext/Errno/Errno_pm.PL     2014-05-26 15:34:20.000000000 
+0200
 +++ perl-5.20.0/ext/Errno/Errno_pm.PL  2014-06-25 10:31:24.317970047 +0200
-@@ -126,11 +126,7 @@
+@@ -114,7 +114,7 @@ sub get_files {
+     # When cross-compiling we may store a path for gcc's "sysroot" option:
+     my $sysroot = $Config{sysroot} || '';
+     my $linux_errno_h;
+-    if ($^O eq 'linux') {
++    if (0) {
+       # Some Linuxes have weird errno.hs which generate
+       # no #file or #line directives
+       ($linux_errno_h) = grep { -e $_ } map { "$_/errno.h" }
+@@ -134,13 +134,6 @@ sub get_files {
        if ($dep =~ /(\S+errno\.h)/) {
             $file{$1} = 1;
        }
 -    } elsif ($^O eq 'linux' &&
 -            $Config{gccversion} ne '' && 
--            $Config{gccversion} !~ /intel/i
+-            $Config{gccversion} !~ /intel/i &&
 -            # might be using, say, Intel's icc
+-            $linux_errno_h
 -           ) {
-+    } elsif (0) {
-     # When cross-compiling we may store a path for gcc's "sysroot" option:
-     my $sysroot = $Config{sysroot} || '';
-       # Some Linuxes have weird errno.hs which generate
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
+-      $file{$linux_errno_h} = 1;
+     } elsif ($^O eq 'haiku') {
+       # hidden in a special place
+       $file{'/boot/develop/headers/posix/errno.h'} = 1;
 diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh 
perl-5.20.0/hints/freebsd.sh
 --- perl-5.20.0-orig/hints/freebsd.sh  2014-01-31 22:55:51.000000000 +0100
 +++ perl-5.20.0/hints/freebsd.sh       2014-06-25 10:25:53.263964680 +0200
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 9ec8024..8ae7558 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -65,14 +65,14 @@
   ;; Yeah, Perl...  It is required early in the bootstrap process by Linux.
   (package
     (name "perl")
-    (version "5.28.2")
+    (version "5.30.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://cpan/src/5.0/perl-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"))
+               "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"))
              (patches (search-patches
                        "perl-no-sys-dirs.patch"
                        "perl-autosplit-default-time.patch"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]