From patchwork Tue Jun 18 11:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 65454 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 ABF6227BBE2; Tue, 18 Jun 2024 12:28:20 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 BDA9D27BBE9 for ; Tue, 18 Jun 2024 12:28:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJX0M-0004d2-AN; Tue, 18 Jun 2024 07:28:02 -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 1sJX0K-0004aq-Tr for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:00 -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 1sJX0K-000821-Jm for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJX0N-0005cd-56 for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71630] [PATCH 4/5] gnu: mingw-w64-tools: Use G-Expressions. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jun 2024 11:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71630@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71630-submit@debbugs.gnu.org id=B71630.171871005721552 (code B ref 71630); Tue, 18 Jun 2024 11:28:03 +0000 Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:37 +0000 Received: from localhost ([127.0.0.1]:42090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzx-0005bT-AJ for submit@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:37 -0400 Received: from mail-lj1-f170.google.com ([209.85.208.170]:52442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzu-0005ad-GL for 71630@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:35 -0400 Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2eaae2a6dc1so94098761fa.0 for <71630@debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1718709986; x=1719314786; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rzu+OGGXIs3XBgkzQUIe5auY6LhECV7vsjk50dzrqFo=; b=mltSHa0Oko1TbL0SVim4uZU1pQTeqtmQ5vK9OfQajBSNaPWcR2+qPKfrQNphFuZRPE Plhx67NGbLvcbq5IG15SKjkwPqSPLZQ1AdSeWgkcCcFhm3nyOVDGJeoznR7vxCcf9+s6 GnVtVrrub+mPNgM1FWqzMr6Vj3eeF7iJqHS1tPffv1KW4ByDfWX8HFFeXUkRV1dmgwYU erZAjIWPiE37SyTf7xEJ4LmXHZoBD1t4Xk/57X8tumLse7i8802NgH4rYg5ycjkMn1zI yrc/dWcO/YmrxwVcvfE74NF7z1p3nXsPC8ehdFyh0YSlkvoZi/vHm8Ft48OxoO6F2zvN Didw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718709986; x=1719314786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rzu+OGGXIs3XBgkzQUIe5auY6LhECV7vsjk50dzrqFo=; b=qj6b13g9iOaY2btZqAJsZ5UMDCA0YaK+7fubShTjNKsynRtVgUphQc6Pa5FPye79Yy eizi9t6gdwbmkgAM+E+wpU6BOTouDwLBI12Z3d00eBbaeemFcH7IKtGKo/hY+NbGGtBq BMiKi4J40qE3dMaaVB3Dd+jq1xyA8QhmNAYvICXZzLc/56IyDmuskHYZg8mHsvPp7AvG DTNDIPNlqXlXdPlxwNYJfyUOOu4O3Zktx+Y+U1+v1YKnLF98l8ArznHhXKeCJK5+31TI g7zzfwZquyA6U5/Eo9luzk2E403wJhg1lNPqycTLW8N72NWaJpA++oqPzHhK/DG7qOFb G3Kw== X-Gm-Message-State: AOJu0Yzk7yikEbohyfXjXSGTocIIuekzvovQlQrHd83xZW+B5slgvmKi 4if+hMT0gNm3c2Z60DuZNGCxdkgVrQbtuIuLSpUTHMlK30PmddWz6oaykMZ6Fjc794ToW6fuMvB 1 X-Google-Smtp-Source: AGHT+IHCLrp3WjVQ9CgCKkLieuna5lkV2MC2SEjwSdupaiwxBhG0XEeTWXAr2Q6l8ZxhOg90r3XG9Q== X-Received: by 2002:a2e:890a:0:b0:2ea:e74c:40a2 with SMTP id 38308e7fff4ca-2ec0e4826ccmr89687881fa.20.1718709985709; Tue, 18 Jun 2024 04:26:25 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 04:26:25 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 18 Jun 2024 13:26:16 +0200 Message-ID: <344b2e60dc52efd6d6f9a09181f045e2daa50702.1718708756.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: 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 * gnu/packages/mingw.scm (mingw-w64-tools): Use G-Expressions. Change-Id: I690d0aeae6c6920d2e3eb43732d6b421a3dfc59b --- gnu/packages/mingw.scm | 70 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index e2fb84ce63..88a2db2141 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -162,45 +162,45 @@ (define-public mingw-w64-tools (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) #:phases - (append - (modify-phases %standard-phases - (add-after 'unpack 'cd-gendef - (lambda _ - (chdir "mingw-w64-tools/gendef")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genidl")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genlib")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genpeimg")))) - (append-map - (lambda (target) + #~(append + (modify-phases %standard-phases + (add-after 'unpack 'cd-gendef + (lambda _ + (chdir "mingw-w64-tools/gendef")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genidl")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genlib")))) (modify-phases %standard-phases (replace 'unpack (lambda _ - (chdir "../widl") - (false-if-exception - (delete-file-recursively "../build")) - #t)) - (replace 'configure - (lambda args - (apply (assoc-ref %standard-phases 'configure) - (append args (list #:out-of-source? #t - #:configure-flags - `("--target" ,target - "--program-prefix" - ,(string-append target "-"))))))))) - '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) + (chdir "../genpeimg")))) + (append-map + (lambda (target) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../widl") + (false-if-exception + (delete-file-recursively "../build")))) + (replace 'configure + (lambda args + (apply (assoc-ref %standard-phases 'configure) + (append args (list #:out-of-source? #t + #:configure-flags + `("--target" ,target + "--program-prefix" + ,(string-append target "-"))))))))) + '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) (home-page "https://mingw-w64.org") (synopsis "Tools of Minimalist GNU for Windows") (description "This package provides the tools of Minimalist GNU for