From patchwork Sun Mar 27 21:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38151 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 14B5C27BBE9; Sun, 27 Mar 2022 22:41:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D886527BBED for ; Sun, 27 Mar 2022 22:41:12 +0100 (BST) Received: from localhost ([::1]:35572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYadM-0006Mg-0c for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:41:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYadC-0006Lq-Pw for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYadC-0005O9-Hn for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYadC-0004VE-G1 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 1/6] gnu: Fix GNU/Linux system detection Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841725117263 (code B ref 49672); Sun, 27 Mar 2022 21:41:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:40:51 +0000 Received: from localhost ([127.0.0.1]:56677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYad0-0004UN-Q8 for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:50 -0400 Received: from mx.kolabnow.com ([212.103.80.155]:18424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYacx-0004Tv-6V for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:47 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 7AC6F141B; Sun, 27 Mar 2022 23:40:40 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417240; x=1650231641; bh=GV+j+K6th9jDA4oAyYqDrvJE3b1Amy8Zx1c 1aM4jfYo=; b=kbfe92cVPzSq5LtPMo1lE/tgWIetmWAofbv6R3fkPp23K6gEizB 5W91zPKt1JUlmWOgOxV69kY+zTXnrwmyu4v7V3DvErlJ27dx7WjjC/GozZzSNEfZ ETteFj2fHj5oN5+79NUL0JZbPBheniotYCEZz5iZ+haRlZlY4qUJmOcKBh6lqFrb CEcn6qZCRp8yWiqvR5K6AyIPXBYCD/wDb1WpNhPFJWst9yoR5rEammvJzwjNtX97 m2Gx5C9h0s875Ojo1iQHtzTfP6cj6R1wET7vMMhUDBfl6Zgnw8yBzjnGc6RsdsV0 afF4xHzSbk5F6ig6i4fcQgAv1MoHvIj+YIRNO0bVWne2Q3lr01WmMHSqOgg0vtb0 4G4PvXk7cugHS2zJx1/C5McS6/Qzc3r06Zn2z3CnlBmVd5hNRSPF4Y4mgQK3U+pR d4Tmf5MoV79a/HEK9C6ADcVL2eQNWCybZkPbASrZH5yaCD4VPj5JmGpKcqbf6D2F LC3f8ZMSzWJ3rxNWPmcTWinOnS5iYHnQ5Zg7He4Hy0jSiS/6O9qzYYZmFs5baF+5 G0cofjVMJ86nrPG3iwyCXQ1oHyp9muHOYy38LVqLG050mAc0O8uKDm3yfMQ8qdjm E22xos+oNJvI3txPmwL6Yp80S3z3A/ClcWNhTdXJZ5tmZ1FYbBQjnx7o= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xtfrv3kqQS_9; Sun, 27 Mar 2022 23:40:40 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id DF0C71419; Sun, 27 Mar 2022 23:40:39 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id BFEF0BC9; Sun, 27 Mar 2022 23:40:38 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:21 -0300 Message-Id: <20220327214026.102723-2-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The current code isn’t strictly correct because the GNU triplet in ‘%current-target-system’ could end in “linux-gnu”. The helper works in all cases. * gnu/packages/messaging.scm (ngircd)[inputs]: Use ‘target-linux?’. [arguments]<#:configure-flags>: Likewise. * gnu/packages/ntp.scm (ntp)[inputs]: Likewise --- gnu/packages/messaging.scm | 8 ++------ gnu/packages/ntp.scm | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f40c3a7e2ccb..44809754212a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -899,17 +899,13 @@ (define-public ngircd (inputs `(("zlib" ,zlib) ("libwrap" ,tcp-wrappers) ("gnutls" ,gnutls) - ,@(if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (target-linux?) `(("linux-pam" ,linux-pam)) '()))) (arguments `(#:configure-flags '("--with-gnutls" "--with-iconv" "--enable-ipv6" "--with-tcp-wrappers" - ,@(if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (target-linux?) '("--with-pam") '())) #:phases diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 7a3c033b2e12..d7f99c614ed8 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -148,8 +148,7 @@ (define-public ntp ("libevent" ,libevent) ;; Build with POSIX capabilities support on GNU/Linux. This allows 'ntpd' ;; to run as non-root (when invoked with '-u'.) - ,@(if (string-suffix? "-linux" - (or (%current-target-system) (%current-system))) + ,@(if (target-linux?) `(("libcap" ,libcap)) '()))) (arguments From patchwork Sun Mar 27 21:40:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38150 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 0539727BBE9; Sun, 27 Mar 2022 22:41:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D521A27BBEC for ; Sun, 27 Mar 2022 22:41:12 +0100 (BST) Received: from localhost ([::1]:35574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYadL-0006Ms-Uq for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:41:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYadD-0006M6-6i for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYadC-0005OH-Uc for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYadC-0004VL-SM for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 2/6] gnu: libgc: Use default argument in =?utf-8?b?4oCYdGFyZ2V0LWh1cmQ/4oCZ?= call Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841725517281 (code B ref 49672); Sun, 27 Mar 2022 21:41:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:40:55 +0000 Received: from localhost ([127.0.0.1]:56681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYad5-0004Ue-14 for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:55 -0400 Received: from mx.kolabnow.com ([212.103.80.153]:17930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYad2-0004UE-MI for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:53 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 16DA340D4E; Sun, 27 Mar 2022 23:40:47 +0200 (CEST) Authentication-Results: ext-mx-out003.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417246; x=1650231647; bh=eGxRZPeoGBPgaY9ZIulrFL0iq5PjMaJfLuq Z2pVLZ/Q=; b=kEu3dAwwTR/pRHCxk0rzN0AM2p/7V9aKkq2e0g/j/ZwsZ2HyfV1 9s0rI0Pp67HUJferE9MILaO4gZ9+V+Agit9citIouXnEXLacbBn43uqRoCLiXHLS +GAxBJZZBoJpsx5s42UFP0iOJSiYPRJxwQr0yxYSsA7IQbCPB0/2MKyqnDfpFjvA qKlnJAEApk4DGxkjxBH1CVhYgEVAj2QVa3Y5xIDlsO+F17mfUWsASyfQlPw0SMVa N4ZmFj6rBJqJwp2eqj/ddA95DXa9nqjZHQINbRlKY+6t4QFo1tCGWe0FTDayK2q0 4fVFZPHZL7Vki3N0TF2DUKk271+/lFfEoqaERUFVC3MqcAy8W0afNyh4Qmh9gusO +PUkB1xBxbxxYfFLxeGUFy0JUVfKfvJLt47n4t55Kuo7ejQxedxzP6OD5veBv5nW Hn4pFwNJV9OydStOhu3WW8weJXt77Fnw+pawW7+7JB2KrZu/UhHNR+uFXWB2QJIo DFLBCAKP60B0tY1twZusb2d6Z6JacwuzH8je5Azjo+XdUm3C9ValYTmcctlLPv5n usWUh41AkzagJtACNrDofPZU2zPjN8xIDcISRuWOWAggU8Faa1Rhjqrc9dzHgnz+ lSfRONtQ/HnsJC3YfWuG4mMFQ/1TLa+dKzmaO0MJc6xg9zfQGNrtX60I= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fyh5gmvpaIxT; Sun, 27 Mar 2022 23:40:46 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id ACED24084C; Sun, 27 Mar 2022 23:40:45 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id E9D14A86; Sun, 27 Mar 2022 23:40:44 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:22 -0300 Message-Id: <20220327214026.102723-3-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches ‘%current-system’ is always defined, so the expression “(or (%current-system) (%current-target-system))” is equivalent to “(%current-system)”, which is unlikely to be the intent of the code. The default argument for ‘target-hurd?’ has the ‘or’ expression in the correct order, so just use that. * gnu/packages/bdw-gc.scm (libgc)[arguments]<#:configure-flags>: Omit argument in call to ‘target-hurd?’. --- gnu/packages/bdw-gc.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 2698d56da00b..13a6691db4b2 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -56,8 +56,7 @@ (define-public libgc ;; to configure script. See bug report and discussion: ;; ;; - ,@(if (target-hurd? (or (%current-system) - (%current-target-system))) + ,@(if (target-hurd?) '("--disable-gcj-support") '())))) (native-inputs (list pkg-config)) From patchwork Sun Mar 27 21:40:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38155 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 C60D427BBEA; Sun, 27 Mar 2022 22:51:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 55FDD27BBE9 for ; Sun, 27 Mar 2022 22:51:17 +0100 (BST) Received: from localhost ([::1]:39424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYan6-00018j-I9 for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:51:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYams-00018O-87 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYamr-0006hH-Vk for guix-patches@gnu.org; Sun, 27 Mar 2022 17:51:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYamr-0004o8-Ji for guix-patches@gnu.org; Sun, 27 Mar 2022 17:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 3/6] utils: Introduce the =?utf-8?q?=E2=80=98?= =?utf-8?q?current-target-nix-system=E2=80=99?= procedure Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841785218462 (code B ref 49672); Sun, 27 Mar 2022 21:51:01 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:50:52 +0000 Received: from localhost ([127.0.0.1]:56708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYamh-0004ng-Oy for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:50:52 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:3440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYamf-0004nT-Jw for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:50:50 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E54031A0D; Sun, 27 Mar 2022 23:41:00 +0200 (CEST) Authentication-Results: ext-mx-out001.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417260; x=1650231661; bh=UCCO8iMFjJihEEtub0kvSDOnPlu+KT7clTY WTK8y2Z8=; b=wa/6iKOSIp7N7yIZgAvGsqY8ZtiPgAJk8XX9uVxErxZw3tbBfxs GcBqf+ShFZecMuxsVf8H2M165v1wNUsg/JTGmfX27Dr4SjzTP8jlh2LeA1Hs0YFI ybBPbWINmAe2Tx0Z0K+3AqflCKZ3UZwq0IKt9bI6FkXHrJNiKPXIKeHSiGTerRVD fBM5NVMFNqQ81HKJmQ1tOp3St0Xw5Zk01NzdyLxeDetnJf/UIP377+WfZgyuRtBQ tCciophfHoJdoTPXmzri2PBn9NwhP9ZWLCAjH8sBPXLzuF+X2rjdUr/AwTID5kyw bggYFeAOlk3SO3sIrVVmQAAc6BQJ9BXX2wDMmZ9xiwyLup/ebCQr6SycMzS7DqVf 6lGUeu6CKR2ja3o/mYzkV3/qYAVQGC89kZBGGCbePPNOjNZjA6YSLdE5zN8FfHRJ wmvXazJUIAKUW4Lvycc7dt/LOTsoi27VLIhAPhUkhHTzQCIahhTEO7NyBvZanNvp srbDsZYJ1VrpQDqpsT0lzGh14qFLB4KHYLgiR89C1c/+0KDzkqk/GddkWalp93cn W21ghzIt9ylUQoqp4cG89ZoYgpWG0puEUipUflDnX4AvQf94f+bxu3SgL1Tn0VfR YzDnlY1LB7E+kkEoMwFbn99E4mUrCaHB+ufBi6asPnAtHBKgEhpi/YFA= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6cTEAJDDo5ia; Sun, 27 Mar 2022 23:41:00 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id C8A5F14D8; Sun, 27 Mar 2022 23:40:50 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 496EBBC9; Sun, 27 Mar 2022 23:40:50 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:23 -0300 Message-Id: <20220327214026.102723-4-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches Both ‘glibc-dynamic-linker’ and ‘system->llvm-target’ use the same logic for the default value of their arguments, so factor it out into a separate procedure. It turns out that this procedure will be useful in other places as well. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Use result of ‘current-target-nix-system’ as default value for ‘system’ argument. * gnu/packages/llvm.scm (system->llvm-target): Likewise. * guix/utils.scm (current-target-nix-system): Define. --- gnu/packages/bootstrap.scm | 4 +--- gnu/packages/llvm.scm | 4 +--- guix/utils.scm | 7 +++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 8bd0c4eaf3ab..8f444b1ff338 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -309,9 +309,7 @@ (define rewritten-input package-with-bootstrap-guile))))) (define* (glibc-dynamic-linker - #:optional (system (or (and=> (%current-target-system) - gnu-triplet->nix-system) - (%current-system)))) + #:optional (system (current-target-nix-system))) "Return the name of Glibc's dynamic linker for SYSTEM." ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc. (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2") diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index eb949bed1b47..e2bc5398715a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -77,9 +77,7 @@ (define-module (gnu packages llvm) system->llvm-target)) (define* (system->llvm-target #:optional - (system (or (and=> (%current-target-system) - gnu-triplet->nix-system) - (%current-system)))) + (system (current-target-nix-system))) "Return the LLVM target name that corresponds to SYSTEM, a system type such as \"x86_64-linux\"." ;; See the 'lib/Target' directory of LLVM for a list of supported targets. diff --git a/guix/utils.scm b/guix/utils.scm index 44c46cb4a96c..d5e15581acea 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -85,6 +85,7 @@ (define-module (guix utils) gnu-triplet->nix-system %current-system %current-target-system + current-target-nix-system package-name->name+version target-linux? target-hurd? @@ -635,6 +636,12 @@ (define %current-target-system ;; cross-building to. (make-parameter #f)) +(define (current-target-nix-system) + "Return the Nix system identifier for the current target, whether we are +cross-building or not." + (or (and=> (%current-target-system) gnu-triplet->nix-system) + (%current-system))) + (define* (package-name->name+version spec #:optional (delimiter #\@)) "Given SPEC, a package name like \"foo@0.9.1b\", return two values: \"foo\" From patchwork Sun Mar 27 21:40:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38153 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 4E73A27BBEA; Sun, 27 Mar 2022 22:42:14 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 460C327BBE9 for ; Sun, 27 Mar 2022 22:42:13 +0100 (BST) Received: from localhost ([::1]:36238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYaeI-0006vK-KO for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:42:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0006ub-FQ for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0005Yg-74 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYaeA-0004XR-5M for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 4/6] gnu: Use =?utf-8?q?=E2=80=98current-targ?= =?utf-8?q?et-nix-system=E2=80=99?= for matches Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841727217360 (code B ref 49672); Sun, 27 Mar 2022 21:42:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:41:12 +0000 Received: from localhost ([127.0.0.1]:56689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadL-0004Vv-98 for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:11 -0400 Received: from mx.kolabnow.com ([212.103.80.155]:18460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadJ-0004Vh-8O for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:10 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 21697141B; Sun, 27 Mar 2022 23:41:03 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417262; x=1650231663; bh=iAhegk3fIkKjwuEGb3aeeoPW9sUL9vpibhc 0UxkN2Gw=; b=uphtYJYnqIjjBFXOG/R0LMlthTWFzwK1/+3m+kcXZgcNE5WMZyx 46McF4TMk5sdnZxF8VFpc7qbU7PNmtWXvKBQf3ldB1vSkbcV4Qht1hjvhVh0MRqo 2pDnFZ/LVSrCpv2Rrma74aDajV3OkKS1EgN3MNIyXaXxtMMeSrQyfCyC26xoWCCa gQsIpre1qEP5IcC84tvmfBaieORA2XPcn0mZ3LopISyY0g6Ba3lKU1ZHoGs4v92o FiEndJmsfe2Dd2xvU7AonSvzj9lG75xhx5pp25s6MYjIGKaCIbqfx27sgQhPjvJu ZdBNr+IgF58MOxufGLp1MCyfxupuo6X3epP64kyIDCWYCH1e4DpiusNLspdHYExH RfUBY9gEmp3E2AOKhR+5fUFlWds8HmWVa9BBIktlxsbGXNv+z1oybp/PKHFrk2Hn SsjG8U4Ko5ABxPv4mX0A65VWSmQB7q6tW5PHaL6tQn6vD3tKRu4StfYXdXMUBbuo 3P1h4HDfL6o/I/rL5rD7CeOSFMdrrn5SZgzZOKdckv7Vfi+4Jk4ELD8R8plsXf/g 1JRZkJSnh+5/UoRmG/YgDM4o+55+dC0tIHO/tJu96YOhA5gOC5VDEWkc2SFLSVE3 XstWyrxgob87ay0bNBRbN4BABQAoOM/EZcB1OG+e7flkSD4a6/cCWksk= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TdL-oFG60kr9; Sun, 27 Mar 2022 23:41:02 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id 7957A1419; Sun, 27 Mar 2022 23:41:01 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id CCE9AA86; Sun, 27 Mar 2022 23:41:00 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:24 -0300 Message-Id: <20220327214026.102723-5-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches Several packages try to match both ‘%current-target-system’ and ‘%current-system’ against lists of Nix system identifiers. This is a bug because while ‘%current-system’ does contain a Nix system identifier, ‘%current-target-system’ contains a GNU triplet, which is different. Some places also check whether the system identifier starts with “-linux”, which is a Nix system identifier. The GNU triplet identifier stored in ‘%current-target-system’ may not match the pattern if it includes a vendor field (e.g., “x86_64-unknown-linux-gnu”, or "i586-pc-gnu”). To fix these problems make these places use the function ‘current-target-nix-system’, which always returns a Nix system identifier. In the case of the “go” and “clisp” packages, this also fixes a bug where ‘%current-system’ and ‘%current-target-system’ were being checked in the wrong order. * gnu/packages/astronomy.scm (libpasastro)[arguments]<#:make-flags>: Use ‘current-target-nix-system’ to match list of Nix system identifiers. * gnu/packages/bootloaders.scm (u-boot-tools)[arguments]<#:phases>: Likewise. * gnu/packages/c.scm (tcc)[arguments]<#:configure-flags>: Likewise. * gnu/packages/compression.scm (zpaq)[arguments]<#:make-flags>: Likewise. * gnu/packages/debug.scm (american-fuzzy-lop): Likewise. (qemu-for-american-fuzzy-lop): Likewise. * gnu/packages/digest.scm (xxhash)[arguments]<#:make-flags>: Likewise. * gnu/packages/golang.scm (go-1.4)[arguments]<#:system>: Likewise. (go-1.14)[arguments]<#:system>: Likewise. * gnu/packages/java.scm (java-swt)[source]: Likewise. (java-jansi)[arguments]<#:phases>: Likewise. * gnu/packages/julia.scm (julia)[arguments]<#:make-flags>: Likewise. * gnu/packages/lisp.scm (clisp)[arguments]<#:configure-flags>: Likewise. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[arguments] <#:builder>: Likewise * gnu/packages/mes.scm (mes)[native-inputs]: Likewise. * gnu/packages/pascal.scm (fpc)[native-inputs]: Likewise. [arguments]<#:phases>: Likewise. * gnu/packages/video.scm (mplayer)[arguments]<#:phases>: Likewise. * gnu/packages/web.scm (nginx)[arguments]<#:phases>: Likewise. * gnu/packages/web.scm (nginx-accept-language-module)[arguments] <#:phases>: Likewise. --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/bootloaders.scm | 4 +--- gnu/packages/c.scm | 3 +-- gnu/packages/compression.scm | 6 ++---- gnu/packages/debug.scm | 6 ++---- gnu/packages/digest.scm | 3 +-- gnu/packages/golang.scm | 6 ++---- gnu/packages/java.scm | 4 ++-- gnu/packages/julia.scm | 3 +-- gnu/packages/lisp.scm | 3 +-- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/mes.scm | 3 +-- gnu/packages/pascal.scm | 6 ++---- gnu/packages/video.scm | 3 +-- gnu/packages/web.scm | 6 ++---- 15 files changed, 22 insertions(+), 40 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c209b1538f72..baa48e382ba4 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1021,11 +1021,11 @@ (define-public libpasastro `(#:tests? #f #:make-flags (list - ,(match (or (%current-target-system) (%current-system)) + ,(match (current-target-nix-system) ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux") "OS_TARGET=linux") (_ #f)) - ,(match (or (%current-target-system) (%current-system)) + ,(match (current-target-nix-system) ("i686-linux" "CPU_TARGET=i386") ("x86_64-linux" "CPU_TARGET=x86_64") ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 798764103117..40dd38fdd28a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -640,9 +640,7 @@ (define-public u-boot-tools (invoke "test/image/test-imagetools.sh"))) ;; Only run full test suite on x86_64 systems, as many tests ;; assume x86_64. - ,@(if (string-match "^x86_64-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (string-match "^x86_64-linux" (current-target-nix-system)) '((add-after 'check 'check-x86 (lambda* (#:key make-flags test-target #:allow-other-keys) (apply invoke "make" "mrproper" make-flags) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d545d98938b0..f9e4c497de6a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -90,8 +90,7 @@ (define-public tcc (assoc-ref %build-inputs "libc") "/lib") ,@(if (string-prefix? "armhf-linux" - (or (%current-target-system) - (%current-system))) + (current-target-nix-system)) `("--triplet=arm-linux-gnueabihf") '())) #:test-target "test")) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3edaecd9518f..7e906eceda52 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1449,16 +1449,14 @@ (define-public zpaq #:make-flags (list (string-append "CPPFLAGS=-Dunix" - ,(match (or (%current-target-system) - (%current-system)) + ,(match (current-target-nix-system) ("x86_64-linux" "") ("i686-linux" "") (_ " -DNOJIT"))) ;; These should be safe, lowest-common-denominator instruction sets, ;; allowing for some optimisation while remaining reproducible. (string-append "CXXFLAGS=-O3 -DNDEBUG" - ,(match (or (%current-target-system) - (%current-system)) + ,(match (current-target-nix-system) ("x86_64-linux" " -march=nocona -mtune=generic") ("i686-linux" " -march=i686 -mtune=generic") ("armhf-linux" " -mtune=generic-armv7-a") diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 80685900ebb6..d96217c95b76 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -228,8 +228,7 @@ (define-public c-vise (license license:ncsa))) (define-public american-fuzzy-lop - (let ((machine (match (or (%current-target-system) - (%current-system)) + (let ((machine (match (current-target-nix-system) ("x86_64-linux" "x86_64") ("i686-linux" "i386") ("aarch64-linux" "aarch64") @@ -304,8 +303,7 @@ (define-public american-fuzzy-lop (define-public qemu-for-american-fuzzy-lop ;; afl only supports using a single afl-qemu-trace executable, so ;; we only build qemu for the native target. - (let ((machine (match (or (%current-target-system) - (%current-system)) + (let ((machine (match (current-target-nix-system) ("x86_64-linux" "x86_64") ("i686-linux" "i386") ("aarch64-linux" "aarch64") diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 4211848fdb61..31e9d315cd07 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -82,8 +82,7 @@ (define-public xxhash (arguments (list #:make-flags #~(list #$(string-append "CC=" (cc-for-target)) - #$(match (or (%current-target-system) - (%current-system)) + #$(match (current-target-nix-system) ;; Detect vector instruction set at run time. ((or "i686-linux" "x86_64-linux") "DISPATCH=1") (_ "DISPATCH=0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a8b845e3012a..e7ebf09f1c46 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -114,8 +114,7 @@ (define-public go-1.4 (guix build utils) (srfi srfi-1)) #:tests? #f ; Tests are run by the all.bash script. - ,@(if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "aarch64-linux" (current-target-nix-system)) '(#:system "armhf-linux") '()) #:phases @@ -264,8 +263,7 @@ (define-public go-1.14 (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:system system) - (if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) + (if (string-prefix? "aarch64-linux" (current-target-nix-system)) "aarch64-linux" system)) ((#:phases phases) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b27892841ec6..aead02d93c31 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3483,7 +3483,7 @@ (define-public java-swt (file32 "x86") (file64 "x86_64")) (let-values (((hash file) - (match (or (%current-target-system) (%current-system)) + (match (current-target-nix-system) ("x86_64-linux" (values hash64 file64)) (_ (values hash32 file32))))) (origin @@ -12092,7 +12092,7 @@ (define-public java-jansi (lambda _ (let ((dir (string-append "build/classes/org/fusesource/" "jansi/internal/native/" - ,(match (or (%current-target-system) (%current-system)) + ,(match (current-target-nix-system) ("i686-linux" "Linux/x86") ("x86_64-linux" "Linux/x86_64") ("armhf-linux" "Linux/armv7") diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 0bdac6617508..c1a1d185d544 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -452,8 +452,7 @@ (define-public julia ;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build ;; binary substitutes for the supported architectures. See also ;; https://docs.julialang.org/en/v1/devdocs/sysimg/#Specifying-multiple-system-image-targets - ,(match (or (%current-target-system) - (%current-system)) + ,(match (current-target-nix-system) ("x86_64-linux" ;; These are the flags that upstream uses for their binaries. "JULIA_CPU_TARGET=generic;generic,-cx16,clone_all;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 361d6409d43a..e6e1aada5b1c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -356,8 +356,7 @@ (define-public clisp (inputs (list libffcall ncurses readline libsigsegv)) (arguments `(#:configure-flags '(,@(if (string-prefix? "armhf-linux" - (or (%current-system) - (%current-target-system))) + (current-target-nix-system)) '("CFLAGS=-falign-functions=4") '()) "--with-dynamic-ffi" diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4ea97368a99e..595630d22b58 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -897,7 +897,7 @@ (define out #$output) %build-inputs)))) (inputs (append (list %guile-bootstrap-tarball) - (match (or (%current-target-system) (%current-system)) + (match (current-target-nix-system) ((or "i686-linux" "x86_64-linux") (list %mescc-tools-bootstrap-tarball %mes-bootstrap-tarball diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index a862d84fc8ce..e5e947cb4df9 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -179,8 +179,7 @@ (define-public mes (propagated-inputs (list mescc-tools nyacc-1.00.2)) (native-inputs (append (list guile-3.0) - (let ((target-system (or (%current-target-system) - (%current-system)))) + (let ((target-system (current-target-nix-system))) (cond ((string-prefix? "x86_64-linux" target-system) ;; Use cross-compiler rather than #:system "i686-linux" to get diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index af7857f08495..7a3260ccbbaf 100644 --- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -89,8 +89,7 @@ (define-public fpc (list expat glibc ld-wrapper ncurses zlib)) (native-inputs ;; FPC is built with FPC, so we need bootstrap binaries. - `(("fpc-binary" ,(match (or (%current-target-system) - (%current-system)) + `(("fpc-binary" ,(match (current-target-nix-system) ("i686-linux" fpc-bootstrap-i386) ;;("powerpc64le-linux" fpc-bootstrap-ppc64le) ;;("powerpc-linux" fpc-bootstrap-ppc) @@ -103,8 +102,7 @@ (define-public fpc #:phases (let ((fpc-bootstrap-path (string-append (getcwd) "/" ,name "-" ,version "/fpc-bin")) - (arch ,(match (or (%current-target-system) - (%current-system)) + (arch ,(match (current-target-nix-system) ("i686-linux" "i386") ("x86_64-linux" "x86_64") (_ "unknown")))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a22265..3684421ecaa7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2089,8 +2089,7 @@ (define-public mplayer (string-append "--prefix=" out) ;; Enable runtime cpu detection where supported, ;; and choose a suitable target. - ,@(match (or (%current-target-system) - (%current-system)) + ,@(match (current-target-nix-system) ("x86_64-linux" '("--enable-runtime-cpudetection" "--target=x86_64-linux")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 75aa5ce9078b..24535226ec20 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -413,8 +413,7 @@ (define-public nginx ,(let ((system "Linux") ; uname -s (release "3.2.0") ; uname -r ;; uname -m - (machine (match (or (%current-target-system) - (%current-system)) + (machine (match (current-target-nix-system) ("x86_64-linux" "x86_64") ("i686-linux" "i686") ("mips64el-linux" "mips64") @@ -603,8 +602,7 @@ (define-public nginx-accept-language-module ,(let ((system "Linux") ; uname -s (release "3.2.0") ; uname -r ;; uname -m - (machine (match (or (%current-target-system) - (%current-system)) + (machine (match (current-target-nix-system) ("x86_64-linux" "x86_64") ("i686-linux" "i686") ("mips64el-linux" "mips64") From patchwork Sun Mar 27 21:40:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38152 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 EE68727BBE9; Sun, 27 Mar 2022 22:42:10 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 7823427BBEA for ; Sun, 27 Mar 2022 22:42:10 +0100 (BST) Received: from localhost ([::1]:36228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYaeH-0006v1-Lo for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:42:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0006uj-S1 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0005Yo-K6 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYaeA-0004XY-IL for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 5/6] gnu: Query membership in =?utf-8?b?4oCY?= =?utf-8?b?c3VwcG9ydGVkLXN5c3RlbXPigJk=?= list with Nix identifier Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841727517377 (code B ref 49672); Sun, 27 Mar 2022 21:42:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:41:15 +0000 Received: from localhost ([127.0.0.1]:56693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadP-0004WC-0Y for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:15 -0400 Received: from mx.kolabnow.com ([212.103.80.153]:17940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadM-0004Vl-4w for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:12 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id AFDA940D4E; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Authentication-Results: ext-mx-out003.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417266; x=1650231667; bh=ee/BH3KlfPSwyA77LPO8RpXondjoJNkN9c9 0OKSsP/U=; b=2eTL498tllzRLV47D2ek0ynjIKgrVqQ81Yq1ASmJLN2nVAzpKwe M3Opzmf39MdlyGFJsPYkHU5lsl3NwoXbQG+vVn2zsDRCerO1BoP6SUri9bc9vTZ9 dTTfzrS4kjr335Z0d8EtqMcSmP6rifk5SzoLGM+e545R3uHNlrPo9Hq2NkfR3nKv ffRhUoDoibS/fQOzsm9Rim5zRl8p206vOCIpLjlNkZh1R6Y+iDEMEfQId1a9dj8G QiOBlY8+XqFh4tQeLEoOcRKHVKjctL2Q5zvqOwWBt/37BwU/fns07X6bbrA+L6TH j9TYkuAfZBYsvKfDJPJ2Mqks50waoDWp8gi5EanJtjzd8hvQVYrDNVMJCcrsiTSH VQi5sk2YulCrcPFEy7O2IVla4tccUXy/9QASmSMfOwH4sSeg/hfm4mUH+LGBXWQB JSXHoV01WpuvVIGFG9h1y2icavCFEC35hwX9bHlv1+WTdpXxynmHOg5PMmz20TD6 9iFaQv8PPowMaBvDF6drQZ+VYGeFbLCYPhs175EswdvYdCh3Kj7uTerE4x+7NeCZ AuUid8jzCPcZV4mYtE4NEkUdvbRyC8vAWcDLXXskY7L4mF1aJsYS2YPgAX/Dn5gp aq0JpgiwipdWNcmgVr4lkcH2G3bKqtmR/V0qDeLKfffSnKb4O5zVy0po= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XMKkrEGiAY0W; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id 3E5294084C; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id B3DD2A86; Sun, 27 Mar 2022 23:41:05 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:25 -0300 Message-Id: <20220327214026.102723-6-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches Packages’ ‘supported-systems’ list contains Nix system identifiers, while ‘%current-target-system’ contains a GNU triplet. We need to use ‘current-target-nix-system’ to query the list, which always returns a Nix system identifier. * gnu/packages/bootloaders.scm (grub)[inputs]: Use ‘current-target-nix-system’ to query membership in (package-supported-systems). --- gnu/packages/bootloaders.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 40dd38fdd28a..98970450900e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -185,16 +185,14 @@ (define-public grub ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and ;; 'grub-install' to recognize mapped devices (LUKS, etc.) - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems lvm2)) `(("lvm2" ,lvm2)) '()) ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' ;; to determine whether the root file system is RAID. - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems mdadm)) `(("mdadm" ,mdadm)) '()) @@ -205,8 +203,7 @@ (define-public grub ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given ;; file system will be readable by GRUB without rebooting. - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems fuse)) `(("fuse" ,fuse)) '()) From patchwork Sun Mar 27 21:40:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38154 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 C341527BBEA; Sun, 27 Mar 2022 22:42:31 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 2DD6E27BBE9 for ; Sun, 27 Mar 2022 22:42:31 +0100 (BST) Received: from localhost ([::1]:36646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYaec-0007Co-Br for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:42:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYaeB-0006ur-8f for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYaeB-0005Yw-0E for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYaeA-0004Xf-Uc for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 6/6] gnu: Fix check of =?utf-8?b?4oCYJWN1cnJl?= =?utf-8?b?bnQtc3lzdGVt4oCZ?= and =?utf-8?b?4oCYJWN1cnJlbnQtdGFyZ2V0LXN5c3Rl?= =?utf-8?b?beKAmQ==?= Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841727917395 (code B ref 49672); Sun, 27 Mar 2022 21:42:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:41:19 +0000 Received: from localhost ([127.0.0.1]:56697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadT-0004WU-8R for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:19 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:3316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadS-0004W9-3f for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:18 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id A9C641AC1; Sun, 27 Mar 2022 23:41:12 +0200 (CEST) Authentication-Results: ext-mx-out001.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417272; x=1650231673; bh=mZaIo0Szcjukf01ZRhCVfZyUiIS9VO8PnzR suaRQw2Y=; b=cFfPIG3vMhwvXAEMFZvzJ37ZDYZFEamKS1Aa2RiyI2ejZzZcvwT VH+jVY5niOZXTbZhVYgGPRd7ilJM65YIKZN//sc536cbNtULsdzBJVLGyCqOBKz5 T8+yNRK23PWK21ELHQKE6p//3brVmA12yiP/Y6iCytktukevz22C6rxRMEfUzT/k tHj+R4pukgjZRzR/zYDgovmwqT+od3YR9KNiwL2QfvDfKHHujEMwl0e9IA3eilFV 3yrcx2NcNtG3MUcYWpwhWbiQ5wvGlE9bx53l6AMf1ggUQoAfHend/fkxiFA6R4xb B0xTxR3o0NZFtFvV9rNDa+jKm/BgQhU8esx23dA4kGPQF/6EWXVBt6bl23ukmCUo EBwjW56AMhApPepMqb4TmDHkA2ScYzxPyTIWsnLP4CGpwo40lZamnBd0qtAFT/tA 5YJx0siGkTqgJvGtK3rpvTHqlH7Mb5ROtPay0Y74dEw5pfcUNArCmekaxcsY1bhM OIRi11cVxEOs0NiEKeg7P0ueUm0qyQyfIe61t4VzEY+obHYtfdtZ8z8k18xqljqF RMwbfFzAfAtRFqy5LekaSfPsk2MYtzanfGVVvnxsZJLSaGUr0Xo2iRjDM4LvyvYy wycyyKNAYe4AYx1RrE5KYnZxWFFiPJ9VvhJyrJbESynHPzXWiJ4dbuxA= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZyN-o9NaEyYj; Sun, 27 Mar 2022 23:41:12 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id EACB2FDB; Sun, 27 Mar 2022 23:41:11 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 33BC6BB1; Sun, 27 Mar 2022 23:41:11 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:26 -0300 Message-Id: <20220327214026.102723-7-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The order of the check is important because ‘%current-system’ is always defined, while ‘%current-target-system’ is only defined when cross-building. Therefore, it’s important to check ‘%current-target-system’ first, otherwise the cross target is never considered. * gnu/packages/crypto.scm (libb2)[arguments]<#:configure-flags>: Check ‘%current-target-system’ first. * gnu/packages/java.scm (jamvm-1-bootstrap)[arguments]<#:phases>: Likewise. [native-inputs]: Likewise. (ant-bootstrap)[arguments]<#:phases>: Likewise. (classpath-jamvm-wrappers)[arguments]<#:builder>: Likewise. * gnu/packages/photo.scm (lensfun)[arguments]<#:configure-flags>: Likewise. * gnu/packages/php.scm (php)[arguments]<#:phases>: Likewise. * gnu/packages/sdl.scm (sdl-gfx)[arguments]<#:configure-flags>: Likewise. * gnu/packages/telephony.scm (pjproject)[arguments]<#:configure-flags>: Likewise. --- gnu/packages/crypto.scm | 4 ++-- gnu/packages/java.scm | 16 ++++++++-------- gnu/packages/photo.scm | 4 ++-- gnu/packages/php.scm | 4 ++-- gnu/packages/sdl.scm | 4 ++-- gnu/packages/telephony.scm | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 63be51f86a21..89694f111e17 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -826,8 +826,8 @@ (define-public libb2 (arguments `(#:configure-flags (list - ,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; fat only checks for Intel optimisations '("--enable-fat") diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index aead02d93c31..77f9f7e8fb86 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -207,8 +207,8 @@ (define jamvm-1-bootstrap "--enable-runtime-reloc-checks" "--enable-ffi") #:phases - ,(if (string-prefix? "aarch64" (or (%current-system) - (%current-target-system))) + ,(if (string-prefix? "aarch64" (or (%current-target-system) + (%current-system))) ;; Makefiles and the configure script need to be regenerated to ;; incorporate support for AArch64. '(modify-phases %standard-phases @@ -218,8 +218,8 @@ (define jamvm-1-bootstrap (inputs (list classpath-bootstrap jikes libffi zip zlib)) (native-inputs - (if (string-prefix? "aarch64" (or (%current-system) - (%current-target-system))) + (if (string-prefix? "aarch64" (or (%current-target-system) + (%current-system))) ;; Additional packages needed for autoreconf. `(("autoconf" ,autoconf) ("automake" ,automake) @@ -285,8 +285,8 @@ (define ant-bootstrap ;; Without these JamVM options the build may freeze. (substitute* "bootstrap.sh" (("^\"\\$\\{JAVACMD\\}\" " m) - ,@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) `((string-append m "-Xnocompact ")) `((string-append m "-Xnocompact -Xnoinlining "))))) @@ -535,8 +535,8 @@ (define classpath-jamvm-wrappers (for-each (lambda (tool) (with-output-to-file (string-append bin tool) (lambda _ - #$@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + #$@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) `((format #t "#!~a/bin/sh ~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \ gnu.classpath.tools.~a.~a $@" diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 2f561abc2f31..eaa905dd3b8c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -426,8 +426,8 @@ (define-public lensfun "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf")))) (build-system cmake-build-system) (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + `(,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; SSE and SSE2 are supported only on Intel processors. '() diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 191dcafb4ae4..e2489d2435a6 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -177,8 +177,8 @@ (define-public php (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) - ,@(if (string-prefix? "arm" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) ;; Drop tests known to fail on armhf. '((for-each delete-file (list diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 4c38e2f05507..a5892934d824 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -198,8 +198,8 @@ (define-public sdl-gfx (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + `(,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; mmx is supported only on Intel processors. '() diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e3071d9b75a7..c694a906f1d0 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -755,8 +755,8 @@ (define-public pjproject "--with-external-srtp" "--with-external-pa" ;; The following flag is Linux specific. - ,@(if (string-contains (or (%current-system) - (%current-target-system)) "linux") + ,@(if (string-contains (or (%current-target-system) + (%current-system)) "linux") '("--enable-epoll") '()) "--with-gnutls" ;disable OpenSSL checks