From patchwork Fri Apr 25 00:04:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41992 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 ACDB927BC4D; Fri, 25 Apr 2025 01:06:37 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 3C35627BC49 for ; Fri, 25 Apr 2025 01:06:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u86aP-0005fp-1m; Thu, 24 Apr 2025 20:06:33 -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 1u86Zw-0005cE-FO for guix-patches@gnu.org; Thu, 24 Apr 2025 20:06:06 -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 1u86Zw-00033w-4H for guix-patches@gnu.org; Thu, 24 Apr 2025 20:06:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=; b=Qoq6bT/wETfy+ftWN6FJeYcvd+6RZPJmLBPVnKn6YrKI+/Fix0MjKN+9jHPcJlEgkSU064baugHFwAOhEcYuLEeHOi34xcaSoOP5t/4D5xNEmSgleo9sNHvTH/eZYyKQSnLX6Qr9IVxPSnHJfO5q4FAIUr/ko5Z2GYO0nOo9X+YsYqDHdOhUYdt0PqI7CGIQ9ZPqyQBFZ59akQnRuNqUcrKjrS0Q8M67MXqsBMIlSTONtD7dz/5v18i9dcv5tv2zNj+n161VvQ7ZsvFObVGV9m5q5GFVexCKumEDYwIQHOgsxBcSVtQNGZQFxPdl15h7saj3oTAglRkJuQgsI8IZeQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u86Zv-0002HY-T9 for guix-patches@gnu.org; Thu, 24 Apr 2025 20:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH 5/5] build-system: android-ndk: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 00:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455395158627 (code B ref 78050); Fri, 25 Apr 2025 00:06:03 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:15 +0000 Received: from localhost ([127.0.0.1]:42828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u86Z8-0002Ez-U7 for submit@debbugs.gnu.org; Thu, 24 Apr 2025 20:05:15 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:55567) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u86Z5-0002BZ-ND for 78050@debbugs.gnu.org; Thu, 24 Apr 2025 20:05:12 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClV1pymz1ccb; Fri, 25 Apr 2025 00:05:10 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78050@debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:10 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.205]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClV1Pp2zyBw; Fri, 25 Apr 2025 00:05:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9E02B263A4C; Fri, 25 Apr 2025 00:05:09 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002292b331a-07f0-4f12-9d36-39cf86546d4f, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 02:04:50 +0200 Message-ID: <20250425000456.14363-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425000456.14363-1-ngraves@ngraves.fr> References: <20250425000456.14363-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 15111265603241763554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745539510; v=1; b=t98xoax4exoTR6Vajoa7SjeEhCGlaR2n8MY2R1+4ipDHIGwHyaGTM9Q9Hhz33P5e0V20s/XT LwSKvJivmCvYqBbfpkS7r2CNdWKLaL1OyXhDg5zDpSSAo5GmTZD2DWTKzMH2WbvhBiapIftMMgx YgYnoxN31NYttuW+g8g7Qi+dKXDQzj0osPu6i744QVxES6w8SUrgjuep9jogcqyJacLssZB6ZO4 Iaue/UGGS9JQH7e4jxYaVIxpZvh29GKf7z6jxVGd1IGQmOeMZFIqIjJFCVlQsvSE+ChE0IH9xxA N24nOPWC6RZvuLZ1SdfQVg7OEKbn4K8bV1hAaCgUEIRDQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 Like in other build-systems, make proper procedures to resolve the build-system build-inputs bindings. * guix/build-system/android-ndk.scm (default-android-build, default-android-googletest): Add procedures. (lower): Use them. --- guix/build-system/android-ndk.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index b8cd56b8719..565ec1d3632 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -33,6 +33,16 @@ (define %android-ndk-build-system-modules `((guix build android-ndk-build-system) ,@%default-gnu-imported-modules)) +(define (default-android-build) + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((android (resolve-interface '(gnu packages android)))) + (module-ref android 'android-make-stub))) + +(define (default-android-googletest) + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((android (resolve-interface '(gnu packages android)))) + (module-ref android 'android-googletest))) + (define* (android-ndk-build name inputs #:key source @@ -100,8 +110,8 @@ (define private-keywords ;; Keep the standard inputs of 'gnu-build-system' ,@(standard-packages))) - (build-inputs `(("android-build" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub)) - ("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest)) + (build-inputs `(("android-build" ,(default-android-build)) + ("android-googletest" ,(default-android-googletest)) ,@native-inputs)) (outputs outputs) (build android-ndk-build)