From patchwork Fri Apr 12 13:15:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3273 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 EC88F16E5C; Fri, 12 Apr 2019 14:25:26 +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 9D54A16DEE for ; Fri, 12 Apr 2019 14:25:26 +0100 (BST) Received: from localhost ([127.0.0.1]:37277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwBK-0004eO-5A for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000205-J5 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00057S-EM for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3F-000537-2Z for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3E-0003MV-U3 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:04 +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.155507498212815 (code B ref 35244); Fri, 12 Apr 2019 13:17:04 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:22 +0000 Received: from localhost ([127.0.0.1]:55629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2V-0003KW-0O for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:22 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:39111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2N-0003JF-Bg for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:14 -0400 Received: by mail-wm1-f52.google.com with SMTP id n25so10983437wmk.4 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16:11 -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=DEc2rAlEd9pbl5JJmSS9luN7s9avQp4WjCnnYbizeb4=; b=op5YBB+CAWFzNDSpJAKdYHDTSUmKUYsoUwY1yN+6ywkutvxhlzavy33n4tzJ36A/DW q3kKeBnyo4J6/vkbP5NqZCb8aMdrh3QBTYzwXQyS0C51zdEAoeRfV+m+XMHDvzy29vX0 7OC1C94Drii8j9XjrzFfTjY7byCk+hbAwbcnr7ZMFDnt0mL7RRtj16nX8sRdFRtUz4r5 PSC09bynR4QAmm4SY9oEtACKu5EwxletI40Hv4XlQMSwoKge5OcAuT8ODR86FFFU2Tbo NiS7HbXxvsYhhMV9LoE3JaKSwRz6lTwUUCO+3vrcb/CIsjAzOh8D5tHSlOzbLlxK/6TM 4a+g== 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=DEc2rAlEd9pbl5JJmSS9luN7s9avQp4WjCnnYbizeb4=; b=sZB6rek/kGmp7m/NlY5sJen9fV3AHWLEGpEGEN7W9NpcfLlzstlfAAc/q6cqie7OvC J7LqrWVYeyupLO+eSKPTazQOWxZbzVCw0qGhdt/lWU9HIE+GjUJkOAIEPcUR4+O2OYtf r4Kwc8Vpm3gEzIKKGjlLcq18t0m5IW4y8Wqrg4bIblBk9uPtEOO0NrPqx39a+krwr24B hpVGm2Ic7XZpNbZx1Q9D5tnkTHx3kJPWQcyOKzXpw1u5DMVoVBwl/SK9t2eswfeVP6Y1 U6kJbfO1lBFFaVRv5AiTgu8RE3PwFgeqESUF5AyTAz3hPOpt4hw30L6WYjI7TkmdBwzq oDgA== X-Gm-Message-State: APjAAAV0yOjRFqM7W7xI7Kz95EyFktnnnkj8zzKUNcIRSzMubLv3lZ4J ZfW5K8/NQI6nQi/64dn9PiWissC3 X-Google-Smtp-Source: APXvYqyI1vo1gi3cAZ1OwaxGNhtyATYULUGhdvNpQ31EQO8Ci0pnOYMmsOhTR9wghmJZhBeMdyP2Vw== X-Received: by 2002:a1c:a64d:: with SMTP id p74mr11694389wme.89.1555074965357; Fri, 12 Apr 2019 06:16:05 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:04 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:54 +0200 Message-Id: <20190412131556.25282-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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/firmware.scm (ath9k-htc-firmware)[phases]: Search for "cross-gcc" in native-inputs in "configure" phase. --- gnu/packages/firmware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 4df4b22843..68476ed826 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,7 @@ '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs #:allow-other-keys) (chdir "target_firmware") ;; 'configure' is a simple script that runs 'cmake' with @@ -67,7 +68,7 @@ (substitute* "configure" (("^TOOLCHAIN=.*$") (string-append "TOOLCHAIN=" - (assoc-ref inputs "cross-gcc") + (assoc-ref native-inputs "cross-gcc") "\n"))) #t)) (replace 'install