From patchwork Sun Sep 17 15:21:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 53990 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 C18A827BBEC; Sun, 17 Sep 2023 16:23: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=-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 41BC627BBE2 for ; Sun, 17 Sep 2023 16:23:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhtbw-0006G3-Vg; Sun, 17 Sep 2023 11:23:01 -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 1qhtbs-0006EP-Dm for guix-patches@gnu.org; Sun, 17 Sep 2023 11:22:56 -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 1qhtbs-0003pf-5Z for guix-patches@gnu.org; Sun, 17 Sep 2023 11:22:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhtbz-0000h1-PD for guix-patches@gnu.org; Sun, 17 Sep 2023 11:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65486] [PATCH v3] syscalls: Consistently use existing linux? definition Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 15:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65486@debbugs.gnu.org Cc: ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Cc: 65486@debbugs.gnu.org, ludo@gnu.org Received: via spool by 65486-submit@debbugs.gnu.org id=B65486.16949641382531 (code B ref 65486); Sun, 17 Sep 2023 15:23:03 +0000 Received: (at 65486) by debbugs.gnu.org; 17 Sep 2023 15:22:18 +0000 Received: from localhost ([127.0.0.1]:51169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhtbE-0000eZ-T5 for submit@debbugs.gnu.org; Sun, 17 Sep 2023 11:22:18 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:22415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhtb2-0000eA-Uw; Sun, 17 Sep 2023 11:22:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=opensmtpd; bh=piq3HuAmYz 0ZSublWNYw+q7hZm+yVf96UF/kswA9A+k=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=s2rWW3nt/RYYNP79ayt2oR/gcWQ erD6Nx5MlmSKJRQoYfygbnQ2tTDccZLTlPT0xtn41KaITl9Mp4h5LP3GQ5UzT9lwUMgP5y 3t+25fe3ZvajH9orhA6V5q4RrmvPv64E/OfZeMUsi/YbTShVI5zSAu3nJWHRQ8RwSmclJE D6Gs= Received: from localhost (ip-078-094-021-002.um19.pools.vodafone-ip.de [78.94.21.2]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 25f1bbec (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 17 Sep 2023 17:21:55 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sun, 17 Sep 2023 17:21:48 +0200 Message-ID: <20230917152149.8587-1-soeren@soeren-tempel.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <87il89yugy.fsf@gnu.org> References: <87il89yugy.fsf@gnu.org> 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 From: Sören Tempel Instead of duplicating this existing logic across the source file. This will make it easier to add additional linux targets (e.g. linux-musl) in the future. * guix/build/syscalls.scm (readdir*): Use linux? constant. * guix/build/syscalls.scm (write-socket-address!): Use linux? constant. * guix/build/syscalls.scm (read-socket-address): Use linux? constant. Signed-off-by: Sören Tempel --- guix/build/syscalls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index d947b010d3..c9c0bf594d 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1244,7 +1244,7 @@ (define (readdir-procedure name-field-offset sizeof-dirent-header (define readdir* ;; Decide at run time which one must be used. - (if (string-contains %host-type "linux-gnu") + (if linux? (readdir-procedure (c-struct-field-offset %struct-dirent-header/linux name) sizeof-dirent-header/linux @@ -1664,7 +1664,7 @@ (define (write-socket-address!/hurd sockaddr bv index) (error "unsupported socket address" sockaddr))))) (define write-socket-address! - (if (string-contains %host-type "linux-gnu") + (if linux? write-socket-address!/linux write-socket-address!/hurd)) @@ -1696,7 +1696,7 @@ (define* (read-socket-address/hurd bv #:optional (index 0)) (vector family))))) (define read-socket-address - (if (string-contains %host-type "linux-gnu") + (if linux? read-socket-address/linux read-socket-address/hurd))