From patchwork Mon Jul 8 09:58:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14506 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 84912171D4; Mon, 8 Jul 2019 11:00:14 +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=unavailable 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 20CC6171D3 for ; Mon, 8 Jul 2019 11:00:14 +0100 (BST) Received: from localhost ([::1]:39988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRR-00054s-Ns for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54669) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRL-00051Y-1N for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRJ-0002z6-TH for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRI-0002xi-LN for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRI-0004sZ-IH for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 01/31] gnu: perl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156257997318315 (code B ref 36477); Mon, 08 Jul 2019 10:00:04 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:33 +0000 Received: from localhost ([127.0.0.1]:57776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQm-0004lF-UL for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:33 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:32985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQl-0004kh-4c for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:32 -0400 Received: by mail-wr1-f54.google.com with SMTP id n9so16360095wru.0 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:31 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=bZtLnWDsJ02d582NKeamkLcDJxvVVaeMDDaBTtcoNCE=; b=YZv1Lm8NHsIJ4QJhBXZy3mcLe16ntmhv2F6HiNh9x63C+n6xsa9mH5q6FXVh4XVmmL psNSh3T8Jj42hCaQnTyMB7Yw3siunjLJjYrsyrErII7GVjGTHqvChSCosz6hO+HFMXPr s9Iz4SWMybBHw9WVhUevCzi7q8jTr79n/bbUR03/GO3D9Np3pBtUo302kfWt5Z2VsVjC wsgjsP9FVaSIMfiVkK+x7QySklTe86ERyCNnfpd6qCUTQLqKhgtXocm4AYZmvZd0iZH4 /FXHV+ydvbflxeR8gPoSJWEjEfphScJ+27YjqstPQ5DtLq2aIQY29Dgc8cvfb9ExhJnX PWYA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=bZtLnWDsJ02d582NKeamkLcDJxvVVaeMDDaBTtcoNCE=; b=h679e3U7wbs4CdygozdQ88Q+BzVM2TMfNL+RrL6ZOFGXUTYJulejGmufH7NAWfRfP7 pE2jdJMz8DQw5U23kyLKJho420IvhKYYO71Uy2U/grTDzs55PPyQv75kFXyuSu/nEOBU 0fGI4Bk8hrTchtcU0oY2wsb5Dgr5FmQtbfYrgYJB822Pddeu5aIuvy9mRNALXUaL2Aq4 wVRDNF/CVy1RTTTAFyXRk36Nxn/GB6Rpv9UTAVoJbq9kqMm0DwU1a8o0H7mjNd0EVM+u L/i9VCokQsBrTMHGv6pWGe7cIWPLFK3H9I61M9Wzi9GW+OCXrj4S9xrpNvUyR8AXIaNp Bdxg== X-Gm-Message-State: APjAAAVa77VZw+is+yXznhhcmtjdI45WVmGBT6kOcASeW1zA8K69mBe2 +Vg6KA4Xu6Kezmf5SHtDXF1xnm7H X-Google-Smtp-Source: APXvYqzffy+Lxyvssm2dI1n4hHGiU9HgEWnoahV0lKpsUvgUh1677eVk1/pYLEJkuwXV56PrUc6Z3w== X-Received: by 2002:a05:6000:42:: with SMTP id k2mr17368326wrx.80.1562579964919; Mon, 08 Jul 2019 02:59:24 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.23 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:24 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:43 +0200 Message-Id: <20190708095913.3460-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> 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")