From patchwork Wed Apr 17 09:54:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 63102 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 AE8D327BBE9; Wed, 17 Apr 2024 10:55:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 00E7C27BBE9 for ; Wed, 17 Apr 2024 10:55:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rx20N-0004mD-Mt; Wed, 17 Apr 2024 05:55:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rx20M-0004lB-M4 for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rx20K-0006lj-P2 for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rx20X-0005OO-Fh for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69476] [PATCH 7/8] guix: cmake-build-system: Handle unknown systems. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2024 09:55:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jean-Pierre De Jesus DIAZ Cc: 69476@debbugs.gnu.org Received: via spool by 69476-submit@debbugs.gnu.org id=B69476.171334771020683 (code B ref 69476); Wed, 17 Apr 2024 09:55:13 +0000 Received: (at 69476) by debbugs.gnu.org; 17 Apr 2024 09:55:10 +0000 Received: from localhost ([127.0.0.1]:45810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx20R-0005N6-Bs for submit@debbugs.gnu.org; Wed, 17 Apr 2024 05:55:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx20M-0005L3-Jn for 69476@debbugs.gnu.org; Wed, 17 Apr 2024 05:55:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rx1zx-0006kB-Tw; Wed, 17 Apr 2024 05:54:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=7T5QB/vDm72ny3lxRv8HP/CHdK5ZvHeW89tpTgQtjuY=; b=lysCRp4LFyYZJxBHeN5F 7rQGjAZ9j0wgLbZUhVCHTwoW8LkbGUYLxJlswanGAyvwryYMeEt59t0ndI4qg+63DdJKe7qIZjo0F CZJXAoPskSBURYyTpFvHfNQ4S2NrGmBNENWWXvkMDzegZ97JDNXqgd9UurpGPzo1T9jfNWo/YNp5R xt8Q3BSY+cV6bqGYSxU0gLR0R5Sp7FqnMG4fevvbkkBR/lNAUhPsIjHonhbDlfLUtgBM5yalAhEsS UOADICPHqmMjhFEJ/RDboyd1SshldkMx25PoPaewPNR6LvdRSgFz/Mv3LeoikfyF95kbBV7LfCEUd BVqwmrK1GlVYMQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <4d426a20ba51e666b481324ff6300ad2af98a5f3.1709219325.git.jean@foundationdevices.com> (Jean-Pierre De Jesus DIAZ's message of "Thu, 29 Feb 2024 16:20:49 +0100") References: <4d426a20ba51e666b481324ff6300ad2af98a5f3.1709219325.git.jean@foundationdevices.com> Date: Wed, 17 Apr 2024 11:54:03 +0200 Message-ID: <87jzkwiabo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Jean-Pierre De Jesus DIAZ skribis: > * guix/build/cmake-build-system.scm (configure): Use Generic as the > system name if the system is unknown. > > Change-Id: Ifd4a618ef67eb420b02d48f05291571aea44e46e > --- > guix/build/cmake-build-system.scm | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm > index d1ff5071be..0774124c95 100644 > --- a/guix/build/cmake-build-system.scm > +++ b/guix/build/cmake-build-system.scm > @@ -69,9 +69,13 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) > target "-gcc") > (string-append "-DCMAKE_CXX_COMPILER=" > target "-g++") > - (if (string-contains target "mingw") > - "-DCMAKE_SYSTEM_NAME=Windows" > - "-DCMAKE_SYSTEM_NAME=Linux")) > + (cond > + ((string-contains target "mingw") > + "-DCMAKE_SYSTEM_NAME=Windows") > + ((string-contains target "linux") > + "-DCMAKE_SYSTEM_NAME=Linux") > + (else > + "-DCMAKE_SYSTEM_NAME=Generic"))) I spoke too fast. This patch is good but it triggers a rebuild of everything that depends on CMake. So for now, I instead amended the last patch of the series like this: I confirmed that this builds and that I get the same hashes. That said, we should arrange to land the ‘cmake-build-system.scm’ patch either on the next ‘core-updates’ branch or on a topic branch. Thoughts? Thanks, Ludo’. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 373ed0e81f..6f0c2da806 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -113,7 +113,9 @@ (define-public ath9k-htc-ar7010-firmware (arguments (list #:target "xtensa-ath9k-elf" #:tests? #f - #:configure-flags #~'("-DTARGET_MAGPIE=ON") + #:configure-flags + #~'("-DCMAKE_SYSTEM_NAME=Generic" ;override default value + "-DTARGET_MAGPIE=ON") #:phases #~(modify-phases %standard-phases (add-before 'configure 'change-directory @@ -140,7 +142,9 @@ (define-public ath9k-htc-ar9271-firmware (arguments (substitute-keyword-arguments (package-arguments ath9k-htc-ar7010-firmware) - ((#:configure-flags flags) #~'("-DTARGET_K2=ON")))) + ((#:configure-flags flags) + #~'("-DCMAKE_SYSTEM_NAME=Generic" ;override default value + "-DTARGET_K2=ON")))) (synopsis "Firmware for the Atheros AR9271 USB 802.11n NICs") (description "This is the firmware for the Qualcomm Atheros AR9271 802.11n USB NICs