From patchwork Mon Jul 8 09:58:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14523 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 61941171D4; Mon, 8 Jul 2019 11:02:52 +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 21390171D2 for ; Mon, 8 Jul 2019 11:02:52 +0100 (BST) Received: from localhost ([::1]:40046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTz-0006XI-G9 for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54887) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRT-0005Ie-W1 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRS-00038n-Ra for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRS-00038N-NR for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRS-0004uI-JZ for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 14/31] gnu: ath9k-htc-firmware: 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:14 +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.156257999018569 (code B ref 36477); Mon, 08 Jul 2019 10:00:14 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:50 +0000 Received: from localhost ([127.0.0.1]:57822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR3-0004pA-QH for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:50 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:45895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQw-0004m0-D3 for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:43 -0400 Received: by mail-wr1-f41.google.com with SMTP id f9so16305219wre.12 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:42 -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=VlSnbutAM6FLnZwejy0Rd/fXSAj6ty+f8m0OjbQ5QKw=; b=e0BLG2Vpp6XG0SkVvn/50hz8uOJNJpjGrBjrb+TwwbURlKMbMh7xfa1IgnvMnPPB51 /ob1Eq7pa2DA+Ql+EY0TMgPVHJcz53Zf8zp1npN7rtTj4m5TVu6Upqnj0t0VcLc7vYwz mswiEhQhgahMSuoPSG5/pgyBmp2IYb210TfeDSYq/PZBhivENhtomLhUR4fFjgTzRrmb jmDeqWfU93k22VFDfoLvb21fl43hRkO4Dq/VzfECNIXsFNqTegTiZdZC+hAMvFGcnurg tdOeDmsnARtwVC6hTIHVEtLn8WPI/UrFB0dW6dg+o//zMG83cFhaOLu5g0u17DRc9PnC b6JQ== 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=VlSnbutAM6FLnZwejy0Rd/fXSAj6ty+f8m0OjbQ5QKw=; b=M0vhmUrzdAOG7cmPTncXANN/282kL7tOK7t3k32lZzuN4wPurTQrpF4dQ6y/FbEHfE AupON2vO2Jjh/tATiAc/D4kSq6Ons/jYigyuAT8qVQj7c9QTvaR9OqpuDIO9tLFcJD0I 0t2X8bITubH3E3ZiDkOzU6eywAEeeNX+8PinlXtpY7Jp3HY8YqhYzKLZMDFvfI9BmBVo 4IwrB7fdNDP6jJSw+jXST7jxp7wjtR9GjaEyHds54Xv3t3k6DFRR7EkSnaaFkq+tyBWD tgjQRIzkiIHLG/DPp5DgUT8N7vPg3uWlNXpTL1AA7twNLGlARywacYtjNib3aNnB9sG3 ykIw== X-Gm-Message-State: APjAAAXn3YIG+RyXOo/AyDzCa7J1jqh78jt+TTipnnT8KZdFczO7Ewnv Fcro74lkUCM3KTzG1ydpjiIkCie3 X-Google-Smtp-Source: APXvYqxgaljiPDiFZnF1C3dvQPT6VVqP/geD0PxHHMOaniRhnGBueJ5zcHFooraMbOr3YAM384oEPw== X-Received: by 2002:adf:fdcc:: with SMTP id i12mr14031162wrs.88.1562579976306; Mon, 08 Jul 2019 02:59:36 -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.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:35 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:56 +0200 Message-Id: <20190708095913.3460-15-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/firmware.scm (ath9k-htc-firmware)[phases]: Search for "cross-gcc" in native-inputs and 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 90cb8845cf..e72a8d2cbd 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 inputs 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 (or native-inputs inputs) "cross-gcc") "\n"))) #t)) (replace 'install