unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* bug#27227: [PATCH] gnu: perl: Update to 5.26.0.
@ 2017-06-04  8:40 Leo Famulari
  2017-06-04 13:45 ` Marius Bakke
  0 siblings, 1 reply; 5+ messages in thread
From: Leo Famulari @ 2017-06-04  8:40 UTC (permalink / raw)
  To: 27227

* gnu/packages/perl.scm (perl): Update to 5.26.0.
* gnu/packages/patches/perl-no-sys-dirs.patch: Update patch context for
'hints/linux.sh'.
---
 gnu/packages/patches/perl-no-sys-dirs.patch | 72 +++++++++++++++--------------
 gnu/packages/perl.scm                       |  4 +-
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/patches/perl-no-sys-dirs.patch b/gnu/packages/patches/perl-no-sys-dirs.patch
index da91fef3b..ec5987561 100644
--- a/gnu/packages/patches/perl-no-sys-dirs.patch
+++ b/gnu/packages/patches/perl-no-sys-dirs.patch
@@ -1,6 +1,6 @@
 Don't look for headers and libraries in "traditional" locations.
 
-Patch from Nixpkgs by Eelco Dolstra <eelco.dolstra@logicblox.com>.
+Patch adapted from Nixpkgs by Eelco Dolstra <eelco.dolstra@logicblox.com>.
 
 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
@@ -185,39 +185,6 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
  case "$plibpth" in
  '') 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:/$::'`
-@@ -178,32 +159,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
--
- # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
- # for this test.
- cat >try.c <<'EOM'
 @@ -367,33 +322,6 @@
  	;;
  esac
@@ -252,3 +219,40 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
  # Linux on Synology.
  if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
      # 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.'
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 812d7548c..c3b486988 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -51,14 +51,14 @@
   ;; Yeah, Perl...  It is required early in the bootstrap process by Linux.
   (package
     (name "perl")
-    (version "5.24.0")
+    (version "5.26.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://cpan/src/5.0/perl-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "00jj8zr8fnihrxxhl8h936ssczv5x86qb618yz1ig40d1rp0qhvy"))
+               "0zxn9hd7mqgq06ikyi6k70ngbvjf01z1paw0jd25byyl0rlwdrzb"))
              (patches (search-patches
                        "perl-no-sys-dirs.patch"
                        "perl-autosplit-default-time.patch"
-- 
2.13.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#27227: [PATCH] gnu: perl: Update to 5.26.0.
  2017-06-04  8:40 bug#27227: [PATCH] gnu: perl: Update to 5.26.0 Leo Famulari
@ 2017-06-04 13:45 ` Marius Bakke
  2017-06-04 16:37   ` Leo Famulari
  0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2017-06-04 13:45 UTC (permalink / raw)
  To: Leo Famulari, 27227

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/perl.scm (perl): Update to 5.26.0.
> * gnu/packages/patches/perl-no-sys-dirs.patch: Update patch context for
> 'hints/linux.sh'.

LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#27227: [PATCH] gnu: perl: Update to 5.26.0.
  2017-06-04 13:45 ` Marius Bakke
@ 2017-06-04 16:37   ` Leo Famulari
  2017-06-04 18:35     ` Marius Bakke
  0 siblings, 1 reply; 5+ messages in thread
From: Leo Famulari @ 2017-06-04 16:37 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 27227

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

On Sun, Jun 04, 2017 at 03:45:50PM +0200, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > * gnu/packages/perl.scm (perl): Update to 5.26.0.
> > * gnu/packages/patches/perl-no-sys-dirs.patch: Update patch context for
> > 'hints/linux.sh'.
> 
> LGTM.

Thanks!

Is core-updates still open for changes like this? Or should I wait until the
next cycle?

So far I built the final 'perl' package and am currently building Git with this
patch.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#27227: [PATCH] gnu: perl: Update to 5.26.0.
  2017-06-04 16:37   ` Leo Famulari
@ 2017-06-04 18:35     ` Marius Bakke
  2017-06-04 19:19       ` Leo Famulari
  0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2017-06-04 18:35 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 27227

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Sun, Jun 04, 2017 at 03:45:50PM +0200, Marius Bakke wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > * gnu/packages/perl.scm (perl): Update to 5.26.0.
>> > * gnu/packages/patches/perl-no-sys-dirs.patch: Update patch context for
>> > 'hints/linux.sh'.
>> 
>> LGTM.
>
> Thanks!
>
> Is core-updates still open for changes like this? Or should I wait until the
> next cycle?

Perl (and openldap) have not been built yet, so I think it's fine.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#27227: [PATCH] gnu: perl: Update to 5.26.0.
  2017-06-04 18:35     ` Marius Bakke
@ 2017-06-04 19:19       ` Leo Famulari
  0 siblings, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2017-06-04 19:19 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 27227-done

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

On Sun, Jun 04, 2017 at 08:35:56PM +0200, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Sun, Jun 04, 2017 at 03:45:50PM +0200, Marius Bakke wrote:
> >> Leo Famulari <leo@famulari.name> writes:
> >> 
> >> > * gnu/packages/perl.scm (perl): Update to 5.26.0.
> >> > * gnu/packages/patches/perl-no-sys-dirs.patch: Update patch context for
> >> > 'hints/linux.sh'.
> >> 
> >> LGTM.
> >
> > Thanks!
> >
> > Is core-updates still open for changes like this? Or should I wait until the
> > next cycle?
> 
> Perl (and openldap) have not been built yet, so I think it's fine.

I merged master into core-updates and pushed this as
f65805485dac3f8c4586648e3f7e901202095a19.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-06-04 19:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-04  8:40 bug#27227: [PATCH] gnu: perl: Update to 5.26.0 Leo Famulari
2017-06-04 13:45 ` Marius Bakke
2017-06-04 16:37   ` Leo Famulari
2017-06-04 18:35     ` Marius Bakke
2017-06-04 19:19       ` Leo Famulari

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).