01/01: gnu: perl: Add more compatibility symlinks to the replacement perl.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 5618193694b08855488b29fae1db42f05ca6deaf
Author: Mark H Weaver <address@hidden>
Date:   Fri Apr 20 23:24:37 2018 -0400

    gnu: perl: Add more compatibility symlinks to the replacement perl.
    
    Fixes <https://bugs.gnu.org/31216>.
    Reported by Julien Lepiller <address@hidden>.
    
    * gnu/packages/perl.scm (perl-5.26.2)[arguments]: Rename the
    'workaround-grafting-version-bug' phase to 'install-compatibility-symlinks'.
    Install symlinks in $out/lib/perl5/site_perl/5.26.1 and $out/bin/perl5.26.1,
    in addition to $out/lib/perl5/5.26.1.  Simplify the code a bit.
---
 gnu/packages/perl.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 33601f3..5b52ec0 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -176,16 +176,16 @@
      (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
+           ;; The path to several installed components include the Perl
+           ;; version number, and these is not rewritten by grafting.  See
+           ;; <https://bugs.gnu.org/31210> and <https://bugs.gnu.org/31216>.
+           (add-after 'install 'install-compatibility-symlinks
              (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (dir (string-append out "/lib/perl5"))
-                      (new "5.26.2")
-                      (old "5.26.1"))
-                 (with-directory-excursion dir
-                   (symlink new old))
+               (let ((out (assoc-ref outputs "out")))
+                 (symlink "perl5.26.2" (string-append out "/bin/perl5.26.1"))
+                 (symlink "5.26.2" (string-append out "/lib/perl5/5.26.1"))
+                 (symlink "5.26.2"
+                          (string-append out "/lib/perl5/site_perl/5.26.1"))
                  #t)))))))))
 
 (define-public perl-algorithm-c3