From patchwork Wed May 14 06:45:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 42587 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 2D78227BC4A; Wed, 14 May 2025 07:46:16 +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=unavailable 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 5088727BC49 for ; Wed, 14 May 2025 07:46:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uF5sS-00032o-01; Wed, 14 May 2025 02:46:04 -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 1uF5sQ-00032e-VR for guix-patches@gnu.org; Wed, 14 May 2025 02:46:03 -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 1uF5sQ-0001On-Fs for guix-patches@gnu.org; Wed, 14 May 2025 02:46:02 -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=o9cPLWKJ567CEjhm2PIccx7eTuilY+nkb9YiJf4J4Gk=; b=NfWokN+LcZiOZ6IihPMjkAm6HhGT+C5QKWy397FompH69eL4ssvWgCdNoXPpYOA1jGYX+DtIHaLfT6V9W1LwOdXKnQeBw69m0ZcwBydbyHI/7GWH1go02mq+F8GaqS2ArI8xt00PBDRTwHeiwNDjrngZ2CiT5x/AQUcxELsk4NLAHfKn06Wr2yCQb+Ipi6MDPJchC+ZxdJVIcQf3OZ63T/RmINlzJLD6TksZoGBSc6m7abeT7uuJmPYPT0yYN92bSGbaBoNyEQrOygWC7bancZRqKQc/gENuWF8Le2Z9w6EoUvIy26MM5OEBkx5IRsLZudBp6pWSKHXcQXnDL0xOHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uF5sQ-0006F1-Al for guix-patches@gnu.org; Wed, 14 May 2025 02:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78417] [PATCH 1/2] gnu: mingw-w64-i686, mingw-w64-x86_64: Use winpthreads. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 May 2025 06:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78417 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78417@debbugs.gnu.org Cc: Carl Dong Received: via spool by 78417-submit@debbugs.gnu.org id=B78417.174720515723974 (code B ref 78417); Wed, 14 May 2025 06:46:02 +0000 Received: (at 78417) by debbugs.gnu.org; 14 May 2025 06:45:57 +0000 Received: from localhost ([127.0.0.1]:38399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uF5sK-0006Ea-Jg for submit@debbugs.gnu.org; Wed, 14 May 2025 02:45:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42190) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uF5sI-0006E9-9k for 78417@debbugs.gnu.org; Wed, 14 May 2025 02:45:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uF5sC-0001Nh-Vl; Wed, 14 May 2025 02:45:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=o9cPLWKJ567CEjhm2PIccx7eTuilY+nkb9YiJf4J4Gk=; b=QF+x/5rD4cIpaxjm6Jjg 9li9cX0tphEPaELIcPKtTqInwExAtO+xXsHn+pZ46iIrkofbfqRo+luhephjotwWY7d0/9BQrBpK9 LdWbO2D2CJf0Xz34G7TJq+5xO3JaJmulGi3SYVlmgjbJmKaMY22+w8AQwM2VR8OrUa2mTFhhhPM/F SFThy3FSHD8EFPes84ys3ucqWrfhQfD7KNk30zF6zm3YavXyBEQ0FFTAgVk2+zdq93QZtoWuaIhX/ UEUH1/yS7y7EGrtL0kFD4MKbi39cIbvumJJxY5ERAOP6XYz/bVtZO3w8ddsoYOSX4o0UbNI50r9Zl n4MCSFRcEVpyPg==; From: Janneke Nieuwenhuizen Date: Wed, 14 May 2025 08:45:21 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 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-i686, mingw-w64-x86_64): Enable winpthreads by default. (mingw-w64-i686-sans-winpthreads, mingw-w64-x86_64-sans-winpthreads): New variables providing variants without winpthreads. Change-Id: Iaf34d9cc812543762cfd626693ea715880341c13 --- gnu/packages/mingw.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index ea579d4043..ed7b87e3b1 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2025 Janneke Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2021 Léo Le Bouter @@ -132,10 +132,10 @@ (define* (make-mingw-w64/implementation machine (define make-mingw-w64 (memoize make-mingw-w64/implementation)) -(define-public mingw-w64-i686 +(define-public mingw-w64-i686-sans-winpthreads (make-mingw-w64 "i686")) -(define-public mingw-w64-x86_64 +(define-public mingw-w64-x86_64-sans-winpthreads (make-mingw-w64 "x86_64")) (define-public mingw-w64-i686-winpthreads @@ -146,6 +146,8 @@ (define-public mingw-w64-x86_64-winpthreads (make-mingw-w64 "x86_64" #:with-winpthreads? #t)) +(define-public mingw-w64-i686 mingw-w64-i686-winpthreads) +(define-public mingw-w64-x86_64 mingw-w64-x86_64-winpthreads) (define-public mingw-w64 mingw-w64-i686) (define-public mingw-w64-tools