From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPT-0006QV-Qt for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPS-0005BM-MU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPS-0005BE-JG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPS-0006X3-G8 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:02 -0400 Subject: [bug#36477] [PATCH v2 01/61] gnu: perl: Fix cross-compilation. References: <87zhlwmpmy.fsf@gmail.com> In-Reply-To: <87zhlwmpmy.fsf@gmail.com> Resent-Message-ID: From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:55 +0200 Message-Id: <20190821085455.18508-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36477@debbugs.gnu.org Cc: Mathieu Othacehe * 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 a3f6e5d050..275cb20d89 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; 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") -- 2.17.1