From patchwork Fri Apr 25 09:26:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42003 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 5E93327BC4B; Fri, 25 Apr 2025 10:30:01 +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 D8DC227BC4A for ; Fri, 25 Apr 2025 10:30:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FN4-0005EQ-31; Fri, 25 Apr 2025 05:29:22 -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 1u8FMn-00058B-Br for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29: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 1u8FMm-0007pq-Fu for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29: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=upjvp7XnbOkuoIOd+tihRfMdy8U/24GFE+InUaG1jFOZ/n/Xw66mjEh6EUqXACHAvMX3ES7ELYntSVGp6jbQU8FKL9yk1N+7kabIb7VwYzdZ/O7y83+y3b5K1+XG0mSJRIuaI/S2xngvcGiVtbSO3HOuGryZfpTxquy0tKAxKLJyTNaLxxYvf1HSeBd8GCAibIj5ktWErzuXN7wxJA3176QmaNOpFJem6ClZ4fVsdzDS3XgdAdMnAIzLyDLiDRg816vt/qa1+n0HpbWD/d0ciCJIhqU8RKoZjWqA99KbZXItCYfwUHpZrNhaW4Czp7NaIGQfLMchobuadm8BpqET4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMm-0000Sp-9L for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 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 09:29:04 +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.17455733081673 (code B ref 78050); Fri, 25 Apr 2025 09:29:04 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:28 +0000 Received: from localhost ([127.0.0.1]:47377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FMB-0000Qv-HK for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:27 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:54579) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLy-0000Pk-BC for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:14 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF85dJVz10DW; Fri, 25 Apr 2025 09:28:12 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78050@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:12 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.253]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF83Vt3zHq2L; Fri, 25 Apr 2025 09:28:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D92C1C3A4E; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0032f5e7004-5fe0-4844-b05f-f0d65732bd92, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:34 +0200 Message-ID: <20250425092759.30369-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6173309193408930530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573292; v=1; b=zF5eAStw6U21eFSz/wL6uOK8Uz8yHrwzs1E6Ivh+T8mio92P0fEg7VzWis0rnECDXhIDU2bM CzUXgzKwWKLq8YZEKnlFVbgAReyPUowCjmBT523hxIKWHd9L50zxKSJbPl4giVLzRYb3cN486Qb TX9DuGHD5eLVH0RNguMcN3+RrmDyfD3b/d4iF69Mmgesbwk3tD/LxEODeEC3G2vr1HH1Gmv0wWS wjr9AQmrt30syxsPIL2feG4kRN9EAmXv5YK/2KUQnAiCJwnCzBhK0lNqjWTxOoZsh3AcvzSkwqC xwZL2Pl3qOSixYSa6HunY5ic2yW1oE6Li1Q65yDWC0NcQ== 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)