From patchwork Tue Jun 18 11:26:14 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: 28500 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 7B20227BBE2; Tue, 18 Jun 2024 12:28:21 +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 DBB3227BBEA 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 1sJX0L-0004ch-UF; Tue, 18 Jun 2024 07:28: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 1sJX0K-0004Vz-2Q 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 1sJX0J-00081m-OI for guix-patches@gnu.org; Tue, 18 Jun 2024 07:27:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJX0M-0005cO-74 for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71630] [PATCH 2/5] gnu: make-mingw-w64: 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:02 +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.171871005621538 (code B ref 71630); Tue, 18 Jun 2024 11:28:02 +0000 Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:36 +0000 Received: from localhost ([127.0.0.1]:42086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzw-0005bD-0O for submit@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:36 -0400 Received: from mail-lj1-f176.google.com ([209.85.208.176]:46233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzs-0005aZ-0N for 71630@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:32 -0400 Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2ec0f3b9cfeso47242631fa.0 for <71630@debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1718709983; x=1719314783; 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=FleaWH3pNmqoLlL+sqr36+E7x0WmXHkdQN1O3J4bAzQ=; b=AvNAIrtrxnGbx43ypQf/N14NiINC8FjpN0se7VbRwMiJP74LVdpXx6K/a+ZpxnOrMe CsNzPG/8PM4p7f5kLXGCDhxF9KAXYZPe95Xy6Nq/6JTomMuZ9a7+KodXxwlTaUTaeBtN gD3Z6c7nmRvTlouBqMeECI9CYb2eJ7FUObKL73FA+TJORoLQcENrC1egymrQpM5oECaL gR7aa/7p5nsM0NXnKEXz49ySbu8MuTKSEyG96QB+77ZbKhfTqjUFRLXiLX/6mmgbMMBh AzKY7L/ov8qubPKpUY5b8UwuVlyPMPBDuiXPNQlceQASIosZaf+zeG54H+hYshE8pcqH ggZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718709983; x=1719314783; 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=FleaWH3pNmqoLlL+sqr36+E7x0WmXHkdQN1O3J4bAzQ=; b=eXXv7ZCMl1tm6+oaAC8cUj7KM2T8MdX7sQ1VW8+GXdOA7XR3FUdp1Zq7/aDHbi5Xt4 9+Z+B2M9C9l1F3Zw0DPogBFQcd9XR9QVSXWEvTLUTMPUOrh35wOgFiFx9K/0ouq0VxiC GQsSO4eJoPNsLMmNiRqNhSt/GPIRkow7EQ/3k9YYPDzh+aaz2DMkQ3xYk9rJu/0WvxXw f69+utQSujHabF6/GMAkT8FX39tAt3aXLBiMzUtV/0o/7L24bzt2JXAl1dEQmdgULLM/ jdMwkjUNY4KGSbFkHOi6l6OQtTAZqYaXC14fK196KFgcwpKGf6Nt3pTUT+CW/438QHaR sf/Q== X-Gm-Message-State: AOJu0YyC/wUyxKfCtVW6CIdVATlSl4m0gqRvHSUk7PEuOY8/qP014pDo YsgiwBYCNRQQWF4bdk3EbhwZqLOKuPBnJsBKBeQLIdiA4nSLbIpcSOtig4QgkFsJPGHaX3sFmLw s X-Google-Smtp-Source: AGHT+IEskcLpDkErBtVT3l2ks4QrHAXWARths2OrLS9AwZmYBOeO5qZUKir6PBBlHNlrnrDooiGrvQ== X-Received: by 2002:a05:6512:15a5:b0:52c:c13e:fedd with SMTP id 2adb3069b0e04-52cc13eff46mr2472742e87.21.1718709982919; Tue, 18 Jun 2024 04:26:22 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 04:26:22 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 18 Jun 2024 13:26:14 +0200 Message-ID: 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 (make-mingw-w64): Use G-Expressions and move some arguments above phases. Change-Id: Ie095dceac635f19f146895c8e3f36d9889108a9a --- gnu/packages/mingw.scm | 67 +++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 1ef2c5e1cf..825a784e0d 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -25,6 +25,7 @@ (define-module (gnu packages mingw) #:use-module (gnu packages) #:use-module (gnu packages cross-base) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix download) @@ -76,37 +77,41 @@ (define* (make-mingw-w64/implementation machine ,(string-append triplet "/lib") ,(string-append triplet "/lib64")))))) (arguments - `(#:configure-flags '(,(string-append "--host=" triplet) - ,@(if with-winpthreads? - '("--with-libraries=winpthreads") - '())) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key inputs #:allow-other-keys) - (let ((xgcc-core (assoc-ref inputs "xgcc-core")) - (mingw-headers (string-append - (getcwd) "/mingw-w64-headers"))) - (setenv "CPP" - (string-append - xgcc-core ,(string-append "/bin/" triplet "-cpp"))) - (setenv "CROSS_C_INCLUDE_PATH" - (string-append - mingw-headers - ":" mingw-headers "/include" - ":" mingw-headers "/crt" - ":" mingw-headers "/defaults/include" - ":" mingw-headers "/direct-x/include")) - (when ,with-winpthreads? - (let ((xlibc (assoc-ref inputs "xlibc"))) - (setenv "CROSS_LIBRARY_PATH" - (string-append - xlibc "/lib" ":" - xlibc "/" ,triplet "/lib")))))))) - #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") - #:parallel-build? #f ; parallel builds often fail with empty .a files - #:tests? #f ; compiles and includes glibc headers - #:strip-binaries? #f)) + (list #:parallel-build? #f ; parallel builds often fail with empty .a files + #:tests? #f ; compiles and includes glibc headers + #:strip-binaries? #f + #:configure-flags + #~(list #$(string-append "--host=" triplet) + #$@(if with-winpthreads? + #~("--with-libraries=winpthreads") + #~())) + #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let ((xgcc-core #+(this-package-native-input + "xgcc-core")) + (mingw-headers (string-append + (getcwd) "/mingw-w64-headers"))) + (setenv "CPP" + (string-append + xgcc-core "/bin/" #$triplet "-cpp")) + (setenv "CROSS_C_INCLUDE_PATH" + (string-append + mingw-headers + ":" mingw-headers "/include" + ":" mingw-headers "/crt" + ":" mingw-headers "/defaults/include" + ":" mingw-headers "/direct-x/include")) + #$@(if with-winpthreads? + #~((let ((xlibc #+(this-package-native-input + "xlibc"))) + (setenv "CROSS_LIBRARY_PATH" + (string-append + xlibc "/lib" ":" + xlibc "/" #$triplet "/lib")))) + #~()))))))) (home-page "https://mingw-w64.org") (synopsis "Minimalist GNU for Windows") (description