From patchwork Wed Jun 26 08:19:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14392 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8C3217167; Wed, 26 Jun 2019 09:20:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 421E517101 for ; Wed, 26 Jun 2019 09:20:07 +0100 (BST) Received: from localhost ([::1]:37520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg39x-0007sN-Hv for patchwork@mira.cbaines.net; Wed, 26 Jun 2019 04:20:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44388) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg39v-0007sF-MQ for guix-patches@gnu.org; Wed, 26 Jun 2019 04:20:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hg39u-0007mc-7B for guix-patches@gnu.org; Wed, 26 Jun 2019 04:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hg39t-0007mG-WC for guix-patches@gnu.org; Wed, 26 Jun 2019 04:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hg39t-0007aR-PJ for guix-patches@gnu.org; Wed, 26 Jun 2019 04:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH] gnu: perl: Fix cross-compilation. References: <20190412131331.24892-1-m.othacehe@gmail.com> In-Reply-To: <20190412131331.24892-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2019 08:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.156153715629110 (code B ref 35244); Wed, 26 Jun 2019 08:20:01 +0000 Received: (at 35244) by debbugs.gnu.org; 26 Jun 2019 08:19:16 +0000 Received: from localhost ([127.0.0.1]:34176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg39A-0007ZS-9G for submit@debbugs.gnu.org; Wed, 26 Jun 2019 04:19:16 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:36750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg398-0007ZF-20 for 35244@debbugs.gnu.org; Wed, 26 Jun 2019 04:19:14 -0400 Received: by mail-wr1-f51.google.com with SMTP id n4so1617744wrs.3 for <35244@debbugs.gnu.org>; Wed, 26 Jun 2019 01:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bZtLnWDsJ02d582NKeamkLcDJxvVVaeMDDaBTtcoNCE=; b=PL8SIzRee4ZUhAQdcAuIpWY+4ZcOOZ2pSoi1juXUuuqEhSN/qyP2ZA6SRnft/jdQeL YlUFg5qbhlBJVkau3lKJe2TJMbrfgoKf6UIRjlYyqZ3mywZPTA/ISfUXW0gWT+/tS81C pjMzNiD37BTQxBdOAQeVzJ2Z9JLWYpOUCAsmbY8eaadtYJpn8fW/XL9oEQw4uzgi7OAv 6P827KRv2aRMqDbB6NYDivN85mkF6X6ufwXKMuwdjkaDB3NfuC0w/jSpqcfIzrTVTBSG hIr8UvCFetgsVgBLf9c0QOLrhQatR1rMwXeC2WSmI49xunuKK0LxlKm0QRzS5DSjyBsb OAoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bZtLnWDsJ02d582NKeamkLcDJxvVVaeMDDaBTtcoNCE=; b=HoGudL+IL253PKWa+LVNdZwJKsO2XZyld7Yza9cd4iSAvMyMHvJ7sJGOHoWLc5T5Hd NLbC26n7m8eRlv+zmpirabpphEgqb82onTMjJkk/Sjo9l3hwTdH39FphcMeOYLRJYNmD cgFeNkA/jXnVg8HcMgu+L3WpmydXSazjixi4NmEWqczZARBkIhZPYJhIKa8qIaT0PJ1z 8CsSHZJJmvfA4hKMvM51+sXVNNSzHtwQbOr3YzgPd77DbmONxBloG3iDmj1go0zpgrBx PXJzzgbUSVHO+Qub79cF6SYlxflbs3NiYhMawGYquQ+hGdc/JEh9MEmtuPruySS0NEyP 9acQ== X-Gm-Message-State: APjAAAW5HtGr101MHr7wMpSySC4o11T/c3gBlbyi6DZBYyPU7hpNy/cO ToH/Q13VHknnA1okfC4xFvDRpikS X-Google-Smtp-Source: APXvYqxzWqAaoVu8Dznsh7PuyARWWOYfBtjutWI3WCNEpgpZCBGs0Ianqf1hWDUYCRZDIhPE0kmQ1Q== X-Received: by 2002:a5d:6709:: with SMTP id o9mr2487883wru.301.1561537147730; Wed, 26 Jun 2019 01:19:07 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id z6sm16097580wrw.2.2019.06.26.01.19.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 26 Jun 2019 01:19:06 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 26 Jun 2019 10:19:01 +0200 Message-Id: <20190626081901.12640-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 63b8e387b8..b348a3e088 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")