From patchwork Sat May 17 14:53:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: yelninei--- via Guix-patches via X-Patchwork-Id: 42654 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 E98F927BC4B; Sat, 17 May 2025 15:55: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.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A122627BC49 for ; Sat, 17 May 2025 15:55:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGIwM-00047B-7V; Sat, 17 May 2025 10:55: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 1uGIwJ-000471-OP for guix-patches@gnu.org; Sat, 17 May 2025 10:55: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 1uGIwI-0006AW-BD for guix-patches@gnu.org; Sat, 17 May 2025 10:55: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:From:Date:To:Subject; bh=2Mn0TtcvdrDGyoGWwZdxqMYbOzdmhXEKOVK49O8uJDw=; b=vsivm0ILZ8WaDbvoIf3s229GPOJH+Qi8F0fHBKMGDnEP9XFgd+uXbc1ZRMBB6L2HCCEil8KbKs9/LXgeIqojZUjHCNvLqyLJ4Dt8drvEfTyPONhzI7zFdcsk/5QWl7On5vRxm1YRzzuKpIouuaIrr5IRVjqKWx91yzVeEpyrVz9yqPqZF8PdfjmUEnDXvTvvXUbJZd0lyi4WeV25aJFVd3a/Nm7fUAw1bLyZDCKgIJs7agcwT2DAls22cWArbRXwV8WaE8Ec6VCiCYtAxxDDcRvZMPD+3lmo2H0HUPwveX1UHScIl19GMPIdH5z6915oekulC86dz/rlRyQYqvdcTA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGIwH-0003Jo-SA for guix-patches@gnu.org; Sat, 17 May 2025 10:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78471] [PATCH core-packages-team 0/5] Restoring the Hurd Resent-From: yelninei@tutamail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 May 2025 14:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78471@debbugs.gnu.org Cc: Janneke Nieuwenhuizen X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174749366612659 (code B ref -1); Sat, 17 May 2025 14:55:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 May 2025 14:54:26 +0000 Received: from localhost ([127.0.0.1]:49662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGIvh-0003I4-08 for submit@debbugs.gnu.org; Sat, 17 May 2025 10:54:26 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60240) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGIvc-0003HS-Ti for submit@debbugs.gnu.org; Sat, 17 May 2025 10:54:22 -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 1uGIvX-00044x-JK for guix-patches@gnu.org; Sat, 17 May 2025 10:54:15 -0400 Received: from mail.w13.tutanota.de ([185.205.69.213]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uGIvU-00067W-4s for guix-patches@gnu.org; Sat, 17 May 2025 10:54:15 -0400 Received: from tutadb.w10.tutanota.de (w10.api.tuta.com [IPv6:fd:ac::d:10]) by mail.w13.tutanota.de (Postfix) with ESMTP id F412689378A1 for ; Sat, 17 May 2025 16:53:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1747493619; s=s1; d=tutamail.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=2Mn0TtcvdrDGyoGWwZdxqMYbOzdmhXEKOVK49O8uJDw=; b=cjo+DYU/26PBKXu+xd7g2rpmwZ4JuwrEyZuusIrIwkpVjeUInDRHg49Bmz3bFXE/ KqRyk/4dJaWOMGgf57c7h+8CoJx4uqMDUFJRqzT+pOh1hKuLL+bAXHgQb3NQzP7tUW0 d80HKi6w7BhitQlVsuIhse5tb6jk8EeuH3Y7s5G1fLFPxxfdPFeSY01ontlqGdg4IbU uDJBZeli4H1KiuJSsrw+4DxJeEqnpjOndBc0Lz/xU4D2XumEl5vdEHrmtF5Wytoo5ty FvYjyOz+QVyOnZYowI6nXRW8zW7W+qtQNSI15k/yJIr6hkrKIJMIvYcY6nJAxwPz2lR 61821bhOIg== Date: Sat, 17 May 2025 16:53:39 +0200 (CEST) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.205.69.213; envelope-from=yelninei@tutamail.com; helo=mail.w13.tutanota.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: yelninei@tutamail.com X-ACL-Warn: , yelninei--- via Guix-patches X-Patchwork-Original-From: yelninei--- via Guix-patches via From: yelninei--- via Guix-patches via 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 Hello, Here are (hopefully) the last remaining patches to fix #77709. I have built things up to bison and automake succesfully. Some notes: I am bad at naming things and labelled the glibc patches according to the gnulib-test they fix. I tried to add comments explaining why things are changed, I hope they are clear enough. In the pthread-once patch I removed the note from the debian patch regarding the symbol version of pthread-once because as soon as glibc 2.42 is available in guix everything will be built against the 2.42 symbol automatically. For the --disable-year2038 changes, several packages in commencement.scm already have it unconditionally and this is now repeated twice on i586-gnu by inheriting the args. Is there a better way to get only the 32bit hurd target than the (and (target-hurd?)      (not (target64bit?))) i am using currently? I dont know what the convention is when the #:configure-flag keyword is added only for a specific target if the keyword is also spliced in or not, but this is only a cosmetic change. The automake test suite seems to be extremely flaky. It fails when the host glibc is 2.39 because of locale errors on stderr  (the test checks for empty stderr)  and some other tests that required multiple tries (~8) to get lucky.  However the t/output-order.sh failure due to libgc warnings from the guile driver on stderr currently on master no longer occurs. Ludovic also mentioned to merge glibc and glibc/hurd again. Yelninei (5):   gnu: glibc/hurd: Fix gnulib tests.   gnu: findutils: Disable 64bit time_t on the 32bit Hurd.   gnu: util-linux: Disable 64bit time_t on the 32bit Hurd.   gnu: tar: Disable 64bit time_t on the 32bit Hurd.   gnu: bison: Link with pthread on the Hurd. gnu/local.mk                                  |   3 + gnu/packages/base.scm                         |  13 ++ gnu/packages/bison.scm                        |  10 +- gnu/packages/commencement.scm                 |   3 +- gnu/packages/linux.scm                        |   7 +- .../glibc-hurd-2.41-pthread-once.patch        | 185 ++++++++++++++++++ .../glibc-hurd-2.41-pthread-sigmask.patch     |  22 +++ .../patches/glibc-hurd-2.41-symlink.patch     |  32 +++ 8 files changed, 271 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/glibc-hurd-2.41-pthread-once.patch create mode 100644 gnu/packages/patches/glibc-hurd-2.41-pthread-sigmask.patch create mode 100644 gnu/packages/patches/glibc-hurd-2.41-symlink.patch base-commit: 4935a8066168c3efc0520d132b6c6a3116eb5d54 From 3730d78b3ec57e7fe281d5dd69628e7047203ed3 Mon Sep 17 00:00:00 2001 Message-ID: <3730d78b3ec57e7fe281d5dd69628e7047203ed3.1747473280.git.yelninei@tutamail.com> In-Reply-To: References: From: Yelninei Date: Mon, 12 May 2025 16:09:00 +0000 Subject: [PATCH core-packages-team 5/5] gnu: bison: Link with pthread on the Hurd. * gnu/packages/bison.scm (bison): Add LIBS=-lphtread on the Hurd. * gnu/packages/commencement.scm (bison-boot0): Strip configure-flags. Change-Id: If47c10c3a653df5fd07119a6fa53a40527d37b56 --- gnu/packages/bison.scm | 10 ++++++++-- gnu/packages/commencement.scm | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 6cd7abe4206..feca0743048 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -24,6 +24,7 @@ (define-module (gnu packages bison) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages m4) #:use-module (gnu packages perl) @@ -44,14 +45,19 @@ (define-public bison "1wjvbbzrr16k1jlby3l436an3kvv492h08arbnf0gwgprha05flv")))) (build-system gnu-build-system) (arguments - '(;; Building in parallel on many-core systems may cause an error such as + `(;; Building in parallel on many-core systems may cause an error such as ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or ;; directory". See . #:parallel-build? #f ;; Similarly, when building tests in parallel, Make may produce this error: ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file ;; or directory". Full log in . - #:parallel-tests? #f)) + #:parallel-tests? #f + ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread + ;; but does not link to it. + ,@(if (target-hurd?) + (list #:configure-flags ''("LIBS=-lpthread")) + '()))) (native-inputs (list perl ;; m4 is not present in PATH when cross-building. m4)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index edd4a1db468..1ffb72945a1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2639,7 +2639,8 @@ (define bison-boot0 (_ '(#:configure-flags '("gl_cv_func_posix_spawn_works=no")))) - ,@(package-arguments bison))))) + ,@(strip-keyword-arguments '(#:configure-flags) + (package-arguments bison)))))) (define flex-boot0 ;; This Flex is needed to build MiG as well as Linux-Libre headers. -- 2.49.0