From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 10:44:46 2022 Received: (at submit) by debbugs.gnu.org; 7 Dec 2022 15:44:46 +0000 Received: from localhost ([127.0.0.1]:50783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2wbF-00026u-GZ for submit@debbugs.gnu.org; Wed, 07 Dec 2022 10:44:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:41132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2wbC-00026o-SG for submit@debbugs.gnu.org; Wed, 07 Dec 2022 10:44:43 -0500 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 1p2wbC-0002dN-IW for guix-patches@gnu.org; Wed, 07 Dec 2022 10:44:42 -0500 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p2wbA-0003Vq-Ir for guix-patches@gnu.org; Wed, 07 Dec 2022 10:44:42 -0500 Received: by mail-qv1-xf32.google.com with SMTP id d13so12894965qvj.8 for ; Wed, 07 Dec 2022 07:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hGw2W7ppMahb9TuT9Noysto5Sx4s0mfVPGITLHKMT5Q=; b=F92q+IOjoFOraRQUz32NzseFk3wmFB+dhFnaps3w5l8kUF3AsGU9KVphtpLpDbzREI UMKQKK+9nXE5cNOvoEPAkCD2qx0bXCjy9624jgOPStMs5t1clZYfkAcztKBk6JWRHhQc mMaW7vOqcVPy1YyEvDPha7RiNsKNs4Pm0XTHoCnxywdC+L1WtaUwSciNkYMmHejA76HP jbec0NtIarvCbsMH/oNkQSqTc1mFiUYEwn6VcGNtoO8sDBqxom+GGWAbfP2wRhTmcQYi O9dDoZtmk0EPoTLui6CZEcY138fFfjrG6/YK017H94/iBCLnzcBV5D/aQWEySpJGplNd kwGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hGw2W7ppMahb9TuT9Noysto5Sx4s0mfVPGITLHKMT5Q=; b=7xzSBbcZpRtUqOWzPsIeRrgoE1560/XWulu7hAy2Gj4vb1opHrMtoA6BxSP6ZMyP8Q g2R4mWhkAWdBzz+Mibh4ihq8dRpYYhHBiHWMHRDlnr0sM5ZgJL/lAb9M7loa2cIE0ZJ1 V/iH0h9QUc7nxZateimWj4Uj+mefvhhQ0SpbX1vC2mSTHyPzZR4zl9hXGgIfdmXBbiIt b5M4iUyP/UMe1YcOqdqTiIPBRXL+g7SbqSPXq4cNOgPTU+DpIWal+ksdAOUYD90Rq2kR I/EY6Co0HH9RmKAgh7Nwjj0Yf/H080OWo8N2f9zBXwiayuM651aBSZ1mnWFURCRqjbc7 E9pQ== X-Gm-Message-State: ANoB5pmd8lEmTFgdlla7X1ioCDuUv0fBclFHLBpifsmmsCKEwpubxODA yLoxzLmYC+2dR/YebiMLPWJMMWEtTVg= X-Google-Smtp-Source: AA0mqf7s9RbbfXfchh4Vfeufc3PQqZw6LKZhUJL6NrXoTNU74zcas8/0v2Cph0M1tBgXskRcOKwn+Q== X-Received: by 2002:a05:6214:3312:b0:4c7:4896:eceb with SMTP id mo18-20020a056214331200b004c74896ecebmr921108qvb.21.1670427878984; Wed, 07 Dec 2022 07:44:38 -0800 (PST) Received: from localhost.localdomain (dsl-205-233-124-140.b2b2c.ca. [205.233.124.140]) by smtp.gmail.com with ESMTPSA id v13-20020a05620a0f0d00b006fb8239db65sm17736176qkl.43.2022.12.07.07.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 07:44:38 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH] gnu: cross-base: Standardize API to use keyword arguments. Date: Wed, 7 Dec 2022 10:44:33 -0500 Message-Id: <20221207154433.17992-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f32; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This makes it possible to invoke the procedures with a single or fewer optional arguments. * gnu/packages/cross-base.scm (contains-keyword?): New procedure. (cross-binutils): Dispatch to either... (cross-binutils/deprecated): ... this renamed procedure or ... (cross-binutils*): ... this new procedure. (cross-kernel-headers, cross-libc/deprecated): Likewise. --- gnu/packages/cross-base.scm | 74 +++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 44c1bb0ef2..add9a2f901 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,9 @@ (define-module (gnu packages cross-base) #:use-module (gnu packages mingw) #:use-module (guix platform) #:use-module (guix packages) + #:use-module (guix diagnostics) #:use-module (guix download) + #:use-module (guix i18n) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -74,7 +77,20 @@ (define (cross p target) `(cons ,(string-append "--target=" target) ,flags)))))) -(define* (cross-binutils target #:optional (binutils binutils)) +(define (contains-keyword? args) + "Check if ARGS contains a keyword object." + (find keyword? args)) + +(define* (cross-binutils . args) + (if (or (= (length args) 1) (contains-keyword? args)) + (apply cross-binutils* args) + (apply cross-binutils/deprecated args))) + +(define* (cross-binutils/deprecated target #:optional (binutils binutils)) + (warning (G_ "'cross-binutils' must be used with keyword arguments~%")) + (cross-binutils* target #:binutils binutils)) + +(define* (cross-binutils* target #:key (binutils binutils)) "Return a cross-Binutils for TARGET using BINUTILS." (let ((binutils (package (inherit binutils) @@ -333,11 +349,27 @@ (define* (cross-gcc target %gcc-cross-include-paths))) (native-search-paths '()))) -(define* (cross-kernel-headers target - #:optional - (linux-headers linux-libre-headers) - (xgcc (cross-gcc target)) - (xbinutils (cross-binutils target))) +(define* (cross-kernel-headers . args) + (if (or (= (length args) 1) (contains-keyword? args)) + (apply cross-kernel-headers* args) + (apply cross-kernel-headers/deprecated args))) + +(define* (cross-kernel-headers/deprecated target + #:optional + (linux-headers linux-libre-headers) + (xgcc (cross-gcc target)) + (xbinutils (cross-binutils target))) + (warning (G_ "'cross-kernel-headers' must be used with keyword arguments~%")) + (cross-kernel-headers* target + #:linux-headers linux-headers + #:xgcc xgcc + #:xbinutils xbinutils)) + +(define* (cross-kernel-headers* target + #:key + (linux-headers linux-libre-headers) + (xgcc (cross-gcc target)) + (xbinutils (cross-binutils target))) "Return headers depending on TARGET." (define xlinux-headers @@ -491,12 +523,30 @@ (define xhurd-core-headers ((or "i586-pc-gnu" "i586-gnu") xhurd-core-headers) (_ xlinux-headers))) -(define* (cross-libc target - #:optional - (libc glibc) - (xgcc (cross-gcc target)) - (xbinutils (cross-binutils target)) - (xheaders (cross-kernel-headers target))) +(define* (cross-libc . args) + (if (or (= (length args) 1) (contains-keyword? args)) + (apply cross-libc* args) + (apply cross-libc/deprecated args))) + +(define* (cross-libc/deprecated target + #:optional + (libc glibc) + (xgcc (cross-gcc target)) + (xbinutils (cross-binutils target)) + (xheaders (cross-kernel-headers target))) + (warning (G_ "'cross-libc' must be used with keyword arguments~%")) + (cross-libc* target + #:libc libc + #:xgcc xgcc + #:xbinutils xbinutils + #:xheaders xheaders)) + +(define* (cross-libc* target + #:key + (libc glibc) + (xgcc (cross-gcc target)) + (xbinutils (cross-binutils target)) + (xheaders (cross-kernel-headers target))) "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS and the cross tool chain." (if (target-mingw? target) base-commit: dfc6957a5af7d179d4618eb19d4f555c519bc6f2 prerequisite-patch-id: 660177fb9eee55d11983ea9360c072730d0d21a5 prerequisite-patch-id: 776778c03bce9b7ad3ab94a120f42b764c00fcae prerequisite-patch-id: eeb2523a77c9c422a5785549dbd29ec0220118d7 prerequisite-patch-id: fd4074fb4cf068ccac3122c19138f098a610542a -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 14 15:34:36 2022 Received: (at control) by debbugs.gnu.org; 14 Dec 2022 20:34:36 +0000 Received: from localhost ([127.0.0.1]:41461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YSa-0001TV-01 for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:34:36 -0500 Received: from mail-vs1-f53.google.com ([209.85.217.53]:41588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YSX-0001TN-HU for control@debbugs.gnu.org; Wed, 14 Dec 2022 15:34:35 -0500 Received: by mail-vs1-f53.google.com with SMTP id t5so948905vsh.8 for ; Wed, 14 Dec 2022 12:34:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=0yxDeC1e7xHrxOqMItII9GgsQyRDPRMoMEXT87da0KA=; b=lbV86Bvi1VWSBVUWUoDYiDasdq+Q7i/bJnfkP1eGwhkIKcnlRQmM1dXc9F3l3vIdvp md3Jh69adYUTWyLfcNGxVBQAN1eM0PU/3spp8+Y1RpU7ZDUFAXhZJmoUVGLJ+K4ogD3S SwO9uL0iFucLhZrPseUhM+wT/0lgqPK9EV7fzd+/3pfIgS+0np9TVgu8XArSS25iMeUt GHwKjiDQGC4SrDT+aus/474NoOny3n4IUISAPAUdQs8iKC0CHcZxIONOEgpptaGCWY2U lq0tAKtbO5hY+jh5eJczu1wC0BjZATftBDKHKxmRjYSwc8DQZ/5mALFk46RRiSsRcAI2 OlIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0yxDeC1e7xHrxOqMItII9GgsQyRDPRMoMEXT87da0KA=; b=DwIM5O8lMbkqZTX5Pq761QlMJ5G7iUwaypEvs6Zcuqw2fhEojtGmHPh6/0Hov4sDtS kyVPM1svUPT2bMQgxjdTUuHbzz3rW3qqEgI64/itODYTOxZQhefksEncEkvLJ1g781bZ D7ufQVjO7yo9DzRTCH7bcdUQIy3lOTRpgENrrWazukwBRuC8EvgTlfOKiDVFV7CXepsr QrROUSu6OAFV1wFJOh75Le9KJLCrGp5eMmmgdQnsgE3or/PqeuET9rPIyKIODZb0yY/g hmlWLzbRrYVW3V0af7kn6lxk5i06T7TmEkrKQ3fog1x8eSPXpNjBvNmPzQjV1c7EYH9q YVrw== X-Gm-Message-State: ANoB5pm6CM2IGTNGgsTiAKAohb+uoYHAuFDKBlZonvNhPtxbUQaaohhX HWDzQDJEJIk+DnjFq+GGQQW2uHgkpondDA== X-Google-Smtp-Source: AA0mqf5SUAHTFQeKp0ZbQIDeVcyjPmIq2tvLoFZkcfr1qV/W6POBArjfPV5aTykA+SfwH+ZNOB7aZw== X-Received: by 2002:a67:f80f:0:b0:3b1:8c92:170e with SMTP id l15-20020a67f80f000000b003b18c92170emr16119842vso.11.1671050067784; Wed, 14 Dec 2022 12:34:27 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id f1-20020a05620a408100b006ecfb2c86d3sm10418473qko.130.2022.12.14.12.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:34:27 -0800 (PST) Date: Wed, 14 Dec 2022 15:34:26 -0500 Message-Id: <87edt13est.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #60056 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 60056 by 59885 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 03 16:14:44 2023 Received: (at 59885-done) by debbugs.gnu.org; 3 Jan 2023 21:14:45 +0000 Received: from localhost ([127.0.0.1]:46832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCocO-0001QT-Mb for submit@debbugs.gnu.org; Tue, 03 Jan 2023 16:14:44 -0500 Received: from mail-vk1-f175.google.com ([209.85.221.175]:41714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCocJ-0001QC-AK for 59885-done@debbugs.gnu.org; Tue, 03 Jan 2023 16:14:43 -0500 Received: by mail-vk1-f175.google.com with SMTP id g65so12481164vkh.8 for <59885-done@debbugs.gnu.org>; Tue, 03 Jan 2023 13:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=lyiNEQu8n66MRyjHrWgPGQTd2Is3fFNV3gGXxX9Njo8=; b=hb96kAd3Us3ivQzqN7RTxfojTXDpJ9mgyRAEYKXg+61S3A9IwdKMX5IJzjCXuCl7cX G7MHxXJUNGBd/DuXPMwYqBuXZfu6VpMwUZUFq3Ovc5dT9mMgNzLfxzRvHpezrTDgCf/n QtHKlWbZAo4U/XsSrw06lGcv9qCDh2rDsAyAT+NVE9AZ37pjtgwGQRwRP29ox3bR1tk6 8y5ILhjjsT//01V/I1A153sbd69frptb+V7xfd6WCJnxRGU8mSleFP8Buw+ggjFZfJVl 2l67g//H56mbz4sGiwwL1midpcG7z3RJFLvB8XNETS0rRUlF13ulHohhd9p5yD2NBr4c yyRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lyiNEQu8n66MRyjHrWgPGQTd2Is3fFNV3gGXxX9Njo8=; b=uzhzGTiXQJqMWNYr79M5VCoSeCaU04nF9J90RHk0HrwIb1wdxLDnlc65kWtD16knz8 KpazC2EFqazNILi9y4xlLt58FnOC2qATNiVs23lHU0bWGSkt8M8yps+tM8k5Ud3zHh/o wNa8+nKa3hV25+wEHznPDHxCXikapKTUnsgK5j6XojraUiZLbsDStzVlNRZHJWHEApx2 WCuS9FJmUnPmb+9c5j3R9NuVsf/wJ5s0p0n1EZnmC+lpmCrN4IvyuaRxiMrFoRY/RUHg 5D0AICeCeT3nq+r1unB5oJqtBz2rvTftsU9edbq25IBqygP5uK0lpgMM23vSBa03zWGd SXCw== X-Gm-Message-State: AFqh2kqfA3WgqgPANxk7iXTTKpfB6l9KC25J76kWGBLsv88YZL5SjHgn ehHnnrvW1pntWyGqUM04MqtSQ0/HALDWtA== X-Google-Smtp-Source: AMrXdXs6K/oyVbBMOjw9z+ewjYnpcIPX/VYJnCG0HgYJxDuGPq3BVxY6xnbY3jo2iA6RQOlr89Al4A== X-Received: by 2002:a1f:5fc4:0:b0:3d5:9ca2:e8ee with SMTP id t187-20020a1f5fc4000000b003d59ca2e8eemr8007092vkb.10.1672780473386; Tue, 03 Jan 2023 13:14:33 -0800 (PST) Received: from hurd (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id dm2-20020a05620a1d4200b006bbc3724affsm22419795qkb.45.2023.01.03.13.14.32 for <59885-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 13:14:33 -0800 (PST) From: Maxim Cournoyer To: 59885-done@debbugs.gnu.org Subject: Re: bug#59885: [PATCH] gnu: cross-base: Standardize API to use keyword arguments. References: <20221207154433.17992-1-maxim.cournoyer@gmail.com> Date: Tue, 03 Jan 2023 16:14:32 -0500 In-Reply-To: <20221207154433.17992-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 7 Dec 2022 10:44:33 -0500") Message-ID: <87pmbv1ft3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59885-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Maxim Cournoyer writes: > This makes it possible to invoke the procedures with a single or fewer > optional arguments. > > * gnu/packages/cross-base.scm (contains-keyword?): New procedure. > (cross-binutils): Dispatch to either... > (cross-binutils/deprecated): ... this renamed procedure or ... > (cross-binutils*): ... this new procedure. > (cross-kernel-headers, cross-libc/deprecated): Likewise. Applied with 2707b6ccd7. Closing. -- Thanks, Maxim From unknown Sun Jun 22 00:29:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 01 Feb 2023 12:24:14 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator