From patchwork Wed May 14 06:45:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 42588 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 4078327BC49; Wed, 14 May 2025 07:47:14 +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 B148B27BC49 for ; Wed, 14 May 2025 07:47:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uF5tS-00038v-Cf; Wed, 14 May 2025 02:47:06 -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 1uF5tP-00038X-TC for guix-patches@gnu.org; Wed, 14 May 2025 02:47:04 -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 1uF5tP-0001SM-CS; Wed, 14 May 2025 02:47:03 -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=YnhNBdXlrOoMIRWsZLhyDZXomnnE/UQBQWZacSGj7tA=; b=qUmXh6cLdt24dKf/WDPMIMhDOjL0IPLTPLzoejoHaJinDm98fiC0sQwqqdoEnoytjtNIhyY0LTNH5NFYMBPV6lIe/fUVrxxnKDQ27ra/BevEn24VMpYyY9kpv72pQb/M7xeQVu5ySODopdueXn45BiQMvYr+pKYhuaDolVP6h/VVvw304PTe4ZfBS2rpZBWg/BrK1RnQ0lNgksfYonCUu4h1fH9O95D3SSiUTneJVxIZNIm53VVwvzHnwIjEAjnnQts4ACoKtXPgSuICZx19ay60CrLuIh+SOeH5uEpLeuKy5Ec1BVUj6WGVxri4Qd0qShJGN7bmte27fnjoOzWuCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uF5tO-0006Hl-0K; Wed, 14 May 2025 02:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78417] [PATCH 2/2] gnu: cross-base: mingw: Use winpthreads by default. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, janneke@gnu.org, ludo@gnu.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Wed, 14 May 2025 06:47:01 +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 , Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie X-Debbugs-Original-Xcc: Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie Received: via spool by 78417-submit@debbugs.gnu.org id=B78417.174720516224010 (code B ref 78417); Wed, 14 May 2025 06:47:01 +0000 Received: (at 78417) by debbugs.gnu.org; 14 May 2025 06:46:02 +0000 Received: from localhost ([127.0.0.1]:38401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uF5sQ-0006Ez-5J for submit@debbugs.gnu.org; Wed, 14 May 2025 02:46:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uF5sJ-0006EB-8D 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 1uF5sD-0001Nr-V9; Wed, 14 May 2025 02:45:49 -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=YnhNBdXlrOoMIRWsZLhyDZXomnnE/UQBQWZacSGj7tA=; b=kn1qgxlQIDOYJuD5qAZ8 oBmu2nFara9eqASOkXI3KTJliEMqtcE7p4UfoabFnEHV98mzGJMrrbjCQiGnUqMoS8qqATTZ6WmC9 NNNRv+s1Fq9xO3CMsvsU73JIyTA6uJ1mxQuz9UUvW21/L8h9S83o0/dl8MgrISmEHZd5O2aeuspP7 srlsGhwR1fSxUGqKYdt/oIbAL3ctCHxO7Jgdohj0ouOAs0jlFFV/3wHxO2IgL5gPHqUj1AYkX3SHc AhF1cwej5cAPJQzGeW6rZsofOAjL6xyKbUNpPusk8NO3hhoyNDWjrLq/4613ZfSrY3c2YbcVtI7mW APlLcDu+VXfteg==; From: Janneke Nieuwenhuizen Date: Wed, 14 May 2025 08:45:22 +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 Using a version of mingw-64 with winpthreads, packages that support posix threads, such as Guile, can be (cross-)built for MinGW with thread support. Also, since gcc-13, a MinGW (cross-)compiler provides g++ with std::mutex when built with a version of mingw-w64 that has winpthreads enabled. * gnu/packages/cross-base.scm (cross-gcc-toolchain/implementation): Add #:with-winpthreads? parameter, defaulting to #t. Pass it... (cross-libc*): ...to new #:with-winpthreads? parameter here, defaulting to #t. Pass it to make-mingw-w64 for winpthread support. Change-Id: Iaf34d9cc812543762cfd626693ea715880341c13 --- gnu/packages/cross-base.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 5df06418e3..97afa240e3 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2018, 2020, 2023-2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2016, 2019, 2023, 2024 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2019, 2023-2025 Janneke Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Marius Bakke @@ -673,7 +673,8 @@ (define* (cross-libc* target (libc (libc-for-target target)) (xgcc (cross-gcc target)) (xbinutils (cross-binutils target)) - (xheaders (cross-kernel-headers target))) + (xheaders (cross-kernel-headers target)) + (with-winpthreads? #t)) "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS and the cross tool chain. If TARGET doesn't have a standard C library #f is returned." @@ -682,7 +683,8 @@ (define* (cross-libc* target (let ((machine (substring target 0 (string-index target #\-)))) (make-mingw-w64 machine #:xgcc xgcc - #:xbinutils xbinutils))) + #:xbinutils xbinutils + #:with-winpthreads? #t))) ((or (? target-linux?) (? target-hurd?)) (package (inherit libc) @@ -787,10 +789,12 @@ (define* (cross-gcc-toolchain/implementation target #:key (base-gcc %xgcc) (xbinutils (cross-binutils target)) + (with-winpthreads? #t) (libc (cross-libc - target - #:xgcc (cross-gcc target #:xgcc base-gcc) - #:xbinutils xbinutils)) + target + #:xgcc (cross-gcc target #:xgcc base-gcc) + #:xbinutils xbinutils + #:with-winpthreads? with-winpthreads?)) (xgcc (cross-gcc target #:xgcc base-gcc #:libc libc