From: Leo Famulari <leo@famulari.name>
To: Mark H Weaver <mhw@netris.org>
Cc: 31210@debbugs.gnu.org
Subject: bug#31210: Perl graft breakage
Date: Wed, 18 Apr 2018 16:52:36 -0400 [thread overview]
Message-ID: <20180418205236.GA26365@jasmine.lan> (raw)
In-Reply-To: <87muy0iaxm.fsf@netris.org>
[-- Attachment #1.1: Type: text/plain, Size: 610 bytes --]
On Wed, Apr 18, 2018 at 03:14:45PM -0400, Mark H Weaver wrote:
> I suggest that we add a phase to the replacement 'perl' to install a
> symlink from $out/lib/perl5/5.26.1 pointing to "5.26.2".
>
> Would you like to try this, Leo, and push it if it solves the problem
> for you?
Thanks for your advice. The attached patch fixes the issue for me.
I would have pushed it but there is one thing I don't understand. Before
I set (replacement #f), the build would fail because the new phase was
run twice, and symlinking fails because it is not "forced" (as in `ln
-sf`). Is this expected behaviour?
[-- Attachment #1.2: 0001-gnu-Perl-Fix-a-grafting-failure-due-to-a-path-that-i.patch --]
[-- Type: text/plain, Size: 2266 bytes --]
From b49afa6cf9e18d57e67c0580a09e0ee9168218e7 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 18 Apr 2018 16:41:39 -0400
Subject: [PATCH] gnu: Perl: Fix a grafting failure due to a path that includes
the package version.
Fixes <https://bugs.gnu.org/31210>.
* gnu/packages/perl.scm (perl-5.26.2)[arguments]: Add a
'workaround-grafting-version-bug' phase.
---
gnu/packages/perl.scm | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 34eef565b..24e055225 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -43,6 +43,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
+ #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages perl-check)
@@ -161,13 +162,27 @@
(define-public perl-5.26.2
(package/inherit perl
(version "5.26.2")
+ (replacement #f)
(source (origin
(inherit (package-source perl))
(uri (string-append "mirror://cpan/src/5.0/perl-"
version ".tar.gz"))
(sha256
(base32
- "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"))))))
+ "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments perl)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The path to libperl.so includes the Perl version number, and this
+ ;; is not handled by grafting. See <https://bugs.gnu.org/31210>.
+ (add-after 'install 'workaround-grafting-version-bug
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (new (string-append out "/lib/perl5/5.26.2"))
+ (old (string-append out "/lib/perl5/5.26.1")))
+ (symlink new old)
+ #t)))))))))
(define-public perl-algorithm-c3
(package
--
2.17.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-04-18 20:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 15:34 [bug#31163] [PATCH] gnu: perl: Replace with 5.26.2 [fixes CVE-2018-{6797, 6798, 6913}] Marius Bakke
2018-04-17 17:59 ` Leo Famulari
2018-04-17 22:35 ` bug#31163: " Marius Bakke
2018-04-18 18:08 ` bug#31210: Perl graft breakage Leo Famulari
2018-04-18 19:14 ` Mark H Weaver
2018-04-18 20:52 ` Leo Famulari [this message]
2018-04-19 7:05 ` Mark H Weaver
2018-04-19 10:28 ` Mark H Weaver
2018-04-19 11:57 ` Mark H Weaver
2018-04-19 14:38 ` Leo Famulari
2018-04-19 15:20 ` Marius Bakke
2018-04-21 5:53 ` Mark H Weaver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180418205236.GA26365@jasmine.lan \
--to=leo@famulari.name \
--cc=31210@debbugs.gnu.org \
--cc=mhw@netris.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.