[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/35: gnu: perl: Fix cross-compilation.
From: |
guix-commits |
Subject: |
02/35: gnu: perl: Fix cross-compilation. |
Date: |
Thu, 10 Oct 2019 11:33:14 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 001504a70ab8e34742aea3fe9e21619a7264dc25
Author: Mathieu Othacehe <address@hidden>
Date: Wed Jun 26 10:16:32 2019 +0200
gnu: perl: Fix cross-compilation.
* gnu/packages/perl.scm (perl)[arguments]: Use cross-libc instead of libc
when
cross-compiling.
---
gnu/packages/perl.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 79d8f3b..03bd710 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -22,6 +22,7 @@
;;; Copyright © 2018, 2019 Pierre Neidhardt <address@hidden>
;;; Copyright © 2018 Kei Kebreau <address@hidden>
;;; Copyright © 2019 Alex Griffin <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,7 +82,7 @@
"perl-reproducible-build-date.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:configure-flags
(let ((out (assoc-ref %outputs "out"))
(libc (assoc-ref %build-inputs "libc")))
@@ -130,7 +131,9 @@
(add-after 'install 'remove-extra-references
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (libc (assoc-ref inputs "libc"))
+ (libc (assoc-ref inputs
+ ,(if (%current-target-system)
+ "cross-libc" "libc")))
(config1 (car (find-files (string-append out "/lib/perl5")
"^Config_heavy\\.pl$")))
(config2 (find-files (string-append out "/lib/perl5")
- branch core-updates created (now 4d14902), guix-commits, 2019/10/10
- 02/35: gnu: perl: Fix cross-compilation.,
guix-commits <=
- 05/35: gnu: tk: Fix cross-compilation., guix-commits, 2019/10/10
- 06/35: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/10/10
- 01/35: gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems., guix-commits, 2019/10/10
- 04/35: gnu: tcl: Fix cross-compilation., guix-commits, 2019/10/10
- 07/35: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/10/10
- 34/35: gnu: libtool: Fix cross-compilation., guix-commits, 2019/10/10
- 08/35: gnu: python: Further cross-compilation fixes., guix-commits, 2019/10/10
- 16/35: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/10/10
- 30/35: gnu: procps: Fix cross-compilation., guix-commits, 2019/10/10
- 29/35: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/10/10