From patchwork Sun Nov 24 07:54:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33784 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 4999127BBE2; Sun, 24 Nov 2024 07:56:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 42B5027BBEA for ; Sun, 24 Nov 2024 07:56:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7TR-0008Iy-8F; Sun, 24 Nov 2024 02:56:05 -0500 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 1tF7TO-0008Ht-UP for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:02 -0500 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 1tF7TO-0001vz-LU; Sun, 24 Nov 2024 02:56:02 -0500 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=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=; b=Yrv5TIABEY3ipNzcPo5UGCIbSy1xQKMOB2ZJT48j6usvl27yhrHN+piJIEvG+TYj3H90O4c1UIU6oXBUlLqO9CgThH9IcNNL0AkT5NM+5aAxNNzJJFsO+QHtz+Wp+rBBBikss4hhQNCPljU1Ckg7IjTnp+DdGCctZVX2NyLw0qG7F163HrxKuDcjpBZ2lydlANhTyYG5fbOEpVuwTSfbEyWVPpDMw8tOTNMp+juCwkuYT6z7nk+fe50fCUoDAD0KrSyMZLE5To6pdpXrkpxoK8UUFkFV6lfzee+GTVnyhWh17mc6efMT/r0kDppHxdEqoA7VwRMbLz3obx1QW4RZXw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7TO-0004V0-2F; Sun, 24 Nov 2024 02:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 01/58] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243495417233 (code B ref 74290); Sun, 24 Nov 2024 07:56:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:54 +0000 Received: from localhost ([127.0.0.1]:60621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TE-0004Tb-1a for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TA-0004Sy-Fa for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:49 -0500 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 1tF7T5-0001rA-2S; Sun, 24 Nov 2024 02:55:43 -0500 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=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=; b=Axk59G5FKCDvawV1cuQ/ MqziUy1vvajd1TJScTyE1FblxRjsjoV81UH41BDe2tYWuCFH8Lko3XNisZ3cI39d8UQ7NZczUq1Vk 3ejCrLzeIkC49jgevCex4UvwlvZy/TRtDYs0JpLRcXjwJ+r+5HnzXWIw0S2n855AGUXBfYLIQjTkv 8oqIQci8qekVAVMsbJcvY7IfgT7OWy49qoDLOMXOk4VtK7FdPti6T5N7aTCWoWZyd3TOljm2+CBMD B6yAd/FgXwS1gjiyWAoN0LGhVOclzuRZ13q8fWQPJ5TztOIyHtsq+LnGfGg7qZK1kS/sKHU8hXlar NJkNTZckGPrfWg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:24 +0100 Message-ID: <666f102f47eacf0209652b6e1f85c7d8905c8438.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/gnumach-version.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20240714 and use it. * gnu/packages/commencement.scm (gnumach-headers-boot0)[origin]: Reset patches. Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5 --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 1 + gnu/packages/hurd.scm | 9 ++++----- gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 04e9b1c0fd..5e05fc9d10 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1461,6 +1461,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnulib-bootstrap.patch \ + %D%/packages/patches/gnumach-version.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ce40f0cea6..1cfaaae1e7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2639,6 +2639,7 @@ (define gnumach-headers-boot0 (source (origin (inherit (package-source gnumach-headers)) + (patches '()) (method (git-fetch-from-tarball (origin diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9c1681f236..a22d0cadce 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -57,21 +57,20 @@ (define (hurd-source-url version) version ".tar.gz")) (define-public gnumach-headers - (let ((revision "0") - (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0")) + (let ((commit "v1.8+git20240714")) (package (name "gnumach-headers") - (version (git-version "1.8" revision commit)) + (version (string-drop commit 1)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/gnumach.git") (commit commit))) + (patches (search-patches "gnumach-version.patch")) (file-name (git-file-name "gnumach" version)) (sha256 - (base32 - "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs")))) + (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/gnumach-version.patch b/gnu/packages/patches/gnumach-version.patch new file mode 100644 index 0000000000..aec3c86a16 --- /dev/null +++ b/gnu/packages/patches/gnumach-version.patch @@ -0,0 +1,23 @@ +Upstream-status: Taken from Debian upstream: + + +Index: gnumach/configure.ac +=================================================================== +--- gnumach.orig/configure.ac ++++ gnumach/configure.ac +@@ -19,6 +19,7 @@ AC_PREREQ([2.57]) + m4_include([version.m4]) + AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], + [AC_PACKAGE_TARNAME]) ++AC_SUBST([PACKAGE_VERSION_SUFFIX]) + AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) + + if test -z "${CFLAGS+set}"; then +Index: gnumach/version.c.in +=================================================================== +--- gnumach.orig/version.c.in ++++ gnumach/version.c.in +@@ -1,2 +1,2 @@ + /* @configure_input@ */ +-const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@"; ++const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@@PACKAGE_VERSION_SUFFIX@"; From patchwork Sun Nov 24 07:54:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33782 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 6BDC727BBE2; Sun, 24 Nov 2024 07:56:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 349F827BBE2 for ; Sun, 24 Nov 2024 07:56:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7TQ-0008IJ-EY; Sun, 24 Nov 2024 02:56:04 -0500 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 1tF7TO-0008Hq-TM for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:02 -0500 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 1tF7TO-0001vy-KO for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:02 -0500 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=Gg6wzNu/TMW/O95Mhzp+nneTviaAYIw85n06FjlS5l8=; b=sbfZ8KB9ppc9WDkeO2vTbgFYGtxHruovjNdaW61a+g3JrNa0jJuC9jhyaZp6oVSiqAW+UWLgRjWSI5C+HhmsseFeVwXnf1YcnCbaa0B5/qIwtNtIr+S4Zy/8oLD7Dc8gDnlbqA5mAiGh5ft4f7pS8TjO83cUC7LmY/4LYL2QNM38I4eKEXFAVgWWT9MbDUfKLn2hML49iTiGEk5sLvZYKM97eacLXVW6vKpCC/z3wClEW7LSQMI4f4fqX07GfeTSzfomkUsYjjfswAQeesh1lHYjqYEqMgHlggj6AUwXn/eEjguv2ZviP44tmwgQWcc4bmq+O36lDH60SErNf9G9/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7TO-0004V9-GR for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 02/58] gnu: mig: Update to 1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243495817250 (code B ref 74290); Sun, 24 Nov 2024 07:56:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:58 +0000 Received: from localhost ([127.0.0.1]:60625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TJ-0004U7-Ml for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TC-0004T1-O3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:50 -0500 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 1tF7T5-0001rI-Ti; Sun, 24 Nov 2024 02:55:45 -0500 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=Gg6wzNu/TMW/O95Mhzp+nneTviaAYIw85n06FjlS5l8=; b=lCDB+g2ySHjyNfvOKqU0 Yf+s19WfTxdmtoQ/+TWEX/4gfHrjboSdfegECRJ+sGFUa8bkLifT/+71H3iq8Hc2PABmCf45td1SP rhdC4HAFaRZVgNu53eJt9ZMDJj4TLyQCSawOBmeTMFk03T1o8xQ6wLSbuJs/vsy7TwitOVvHH0/vi XICyux+h4OCZEka1fD9n2LhQr+OK5ai36DpFgu5Rk+H0ZBjGgqTi8dMOfVVPwxYgJX2V486iJJUq4 3xDgITNA4DJTtbtw9FQC/kjExFl9JnS2dXfsfiz78h/p2D/2EzOEdcaOr+W5ffv0fBjstsPME3dXL yB+nmu2Ix4vP8w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:25 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/hurd.scm (mig): Update to 1.8+git20231217. Change-Id: I0e531ecc7fdcfbefe2e0e24d7b2fb5e0fe8a3ae2 --- gnu/packages/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index a22d0cadce..28f39cc448 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -92,7 +92,7 @@ (define-public gnumach-headers (define-public mig (package (name "mig") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (method git-fetch) (uri (git-reference @@ -101,7 +101,7 @@ (define-public mig (file-name (git-file-name name version)) (sha256 (base32 - "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz")))) + "1mx7w5vzw5ws0zplm1y6s679jb1g2hjkiwl3dlk5lxys0dxs5g4g")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. (inputs (list gnumach-headers flex)) From patchwork Sun Nov 24 07:54:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33785 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 C398927BBEB; Sun, 24 Nov 2024 07:56:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 9B3D527BBE2 for ; Sun, 24 Nov 2024 07:56:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7TR-0008J5-Nw; Sun, 24 Nov 2024 02:56:05 -0500 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 1tF7TQ-0008II-AN for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:04 -0500 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 1tF7TQ-0001wu-1E for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:04 -0500 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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; b=K+UMCt3CiAO+eufAX6MvBSGGWaEo6NuvilDwqrjyT9GYc5Xvgjiryxch9XGvac/flSK52+p1OXDsUlcSvs1ZedyIUzNjZC+5HYmO4HzuuFa/UnapmYCHRgdUXF4wbTbDy8m36AEz2hMcxJRzxAqzprmTU+xaNU+lTmxjVMhWOoy9vGrkUHliO00gqOmfSOzaiCOFBdnlKIXiOAOyXATfTeM0qG8darmxFPv2oemSm44tAHRsEeayqifWQrY9aQWre8OBozllAzZrdA/7YczaoPApcnvwVWzWbIlu6FsWGG8qe914ac5M5B1ZgH0yb1eYG+oxAKlLSo6hkuJVVmvS/w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7TP-0004VX-Ra for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 03/58] gnu: hurd: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243495817265 (code B ref 74290); Sun, 24 Nov 2024 07:56:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:58 +0000 Received: from localhost ([127.0.0.1]:60627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TK-0004UB-47 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TC-0004T2-O4 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:51 -0500 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 1tF7T6-0001rL-QC; Sun, 24 Nov 2024 02:55:45 -0500 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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; b=R5eVza9HmS1q1xHyc6I9 xc5FSb5IiTS0tnWAyFdRSrnE/rJ5NgYtCszCJn4Lnlkap1SsCMJTihSykT5BlzSFgY/y86pErHq7k rx+yKfNbuNyw5GhTMIDSkZ8Zc15TsNYzo2rlIIG6RK2b2XL5IOLhwG3Ym2+ctpESobrkTwztdwrjY WNIXHNHx02CU8oQfVc10Xn3Oqha7xnagTHaaQdDikTM++YkArq8gE2IF4nG8NpqFB4Z5QJOUt+uCQ d6H5eaAIP4M8ZMmlUNuOeh+vhtYMqJ+sjxeS68XIF7l4ITZJFWMcYAGTEoQzK2KHa5Ikbh3Bmyvf1 +kELgf49i8hX/g==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:26 +0100 Message-ID: <7e43931a12f914136fba84bc38b0eea97cdded79.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/hurd.scm (hurd-headers): Update to 0.9.git20240714. (hurd)[arguments]: Remove rumpdisk build hack from "prepare-addons" stage. Instead, when cross-compiling, add stage "fixup-cross-configure" to enable rumpdisk. * gnu/system.scm (hurd-multiboot-modules): Remove "--x-xattr-translator-records" option that has been removed and is now the default. Change-Id: I4609b5a959c1ece98e2fe1aedbb1d31d6edadcca --- gnu/packages/hurd.scm | 12 +++++++++--- gnu/system.scm | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 28f39cc448..06fae1bd3b 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -132,7 +132,7 @@ (define-public mig (define-public hurd-headers (let ((revision "3") - (commit "v0.9.git20231217")) + (commit "v0.9.git20240714")) (package (name "hurd-headers") (version (string-drop commit 1)) @@ -143,7 +143,7 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "1d138kzhil6s5gf9di8grpz1iziakyfv037wkc8s7qyd61imm31d")) + "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -336,7 +336,7 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit rumpdisk")))) + "libbpf libmachdevdde libddekit ")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -362,6 +362,12 @@ (define-public hurd (("#include " m) (string-append "#include \n#include \n" m))) #t)) + ,@(if (%current-target-system) + '((add-after 'configure 'fixup-cross-configure + (lambda _ + (substitute* "config.make" + (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes"))))) + '()) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. diff --git a/gnu/system.scm b/gnu/system.scm index 074cd04a0e..dfcb8fb279 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1539,7 +1539,6 @@ (define (hurd-multiboot-modules os) "--multiboot-command-line='${kernel-command-line}'" "--exec-server-task='${exec-task}'" "--store-type=typed" - "--x-xattr-translator-records" "'${root}'" "'$(fs-task=task-create)'")) (target (%current-target-system)) From patchwork Sun Nov 24 07:54:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33783 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 4536B27BBE2; Sun, 24 Nov 2024 07:56:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8C0E127BBE2 for ; Sun, 24 Nov 2024 07:56:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7TY-0008Kk-W8; Sun, 24 Nov 2024 02:56:13 -0500 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 1tF7TX-0008Jq-B2 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 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 1tF7TX-00023M-2E; Sun, 24 Nov 2024 02:56:11 -0500 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=Pa6Y9FF7/lLK4NUbc/ksHzZkdmPZ4YxoB3qlTOOJwww=; b=aC6o2zz6q+OHfTkr3sWc6ayhpPMnY4ND46dEvcPZXV1mNjlOaoUpnwjQOH5bSOgV891Pqeqf6pRyw1Ofo8xxqVDqshUJVzj/3B3VRUnV6d8b11u0W5/3SFfZmSihyAPJsbUQuwLQh7EIwGfyFwyZ2NW8XA3/KzgwulJMVzYBforicAw1dp3rxDhMK/oas3/6ZSMJjNYjnYqJI1UHv5QzxH8e/UDpSk4EkWx/oKuIhQmfmnM7a4+cAI0MpNaPnUldbT1k/akzrEWAmqR+SeTLl0Q0KRJc69/1FKdfu1ir3/Q0NigCho6RmfT5/CBxpzyn0Eb1ZoYbKHLChg+j3LFJdw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7TQ-0004Vm-GZ; Sun, 24 Nov 2024 02:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 04/58] gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243495917271 (code B ref 74290); Sun, 24 Nov 2024 07:56:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:59 +0000 Received: from localhost ([127.0.0.1]:60629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TK-0004UQ-On for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TD-0004T4-NJ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:52 -0500 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 1tF7T8-0001rW-HE; Sun, 24 Nov 2024 02:55:46 -0500 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=Pa6Y9FF7/lLK4NUbc/ksHzZkdmPZ4YxoB3qlTOOJwww=; b=d8+SwVxv/eFQ7coTpRmd LsoYzoGQFVqbE1N8IDHLBP7uMUkK7lQM+3WRxmMO0I0ilR8myOB6ye/C4o4Jp6dGuMohBEGN9C646 1ImKEiczO7TXtenV1HsBPH7B7KqJoKY3f8WbSKrUC+qiur+WBn3rF8H4udNO83wOmMUeT/oVuDY9Z BDcxc9qSeMZo6uYB++UIb8zjCFv5VhO7AYoLegVgfKGdZ7INJi84nZTg6P1LxYMSGxVeaNikyu/iv etuDy1fVzdo2eEGKTE+JjNw5inEO8ppCdy99JyurTcfkFjklo9TWuDY8eIqd+1ta9aKi75X+bohjP qNbaRHJGuPEhIA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:27 +0100 Message-ID: <7b759ee67a38204e7bb3f0f81009637456a5d6b7.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/bootstrap.scm (glibc-dynamic-linker): Update comment on where to find shared linker name. (make-raw-bag): Also use raw-build-guile3 when building for the 64bit Hurd. * gnu/packages/cross-base.scm (cross-kernel-headers*): Use target-hurd? instead of custom "i586..." matching to also use xhurd-core-headers for target-hurd64. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc) [native-inputs]: Move final-inputs before cross-packages. (%binutils-static)[arguments]: When building for the 64bit Hurd, add "lt_cv_prog_compiler_static_works=yes", "lt_cv_prog_compiler_static_works_CXX=yes" to #:make-flags to convince to actually link the binaries statically. (make-guile-static)[arguments]: When building for the 64bit Hurd, add "lt_cv_prog_compiler_static_works=yes" to #:configure-flags to convince libtool to actually link guile statically. * guix/platforms/x86.scm (x86_64-gnu): New exported variable. * guix/utils.scm (target-hurd64? system-hurd64?): New procedures. --- gnu/packages/bootstrap.scm | 3 ++- gnu/packages/cross-base.scm | 6 +++--- gnu/packages/make-bootstrap.scm | 24 +++++++++++++++++------- guix/platforms/x86.scm | 11 ++++++++++- guix/utils.scm | 15 ++++++++++++++- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3743abf9fe..33cbaa30ae 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -558,7 +558,8 @@ (define* (make-raw-bag name (name name) (system system) (build-inputs inputs) - (build (cond ((target-riscv64?) + (build (cond ((or (target-riscv64?) + (target-hurd64?)) raw-build-guile3) (else raw-build))))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 5781341a87..83672ab383 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -641,9 +641,9 @@ (define* (cross-kernel-headers* target ("hurd-headers" ,xhurd-headers) ("hurd-minimal" ,xhurd-minimal))))) - (match target - ((or "i586-pc-gnu" "i586-gnu") xhurd-core-headers) - (_ xlinux-headers))) + (if (target-hurd? target) + xhurd-core-headers + xlinux-headers)) (define* (cross-libc . args) (if (or (= (length args) 1) (contains-keyword? args)) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index edc536bff4..689d48d342 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -145,7 +145,10 @@ (define (package-with-relocatable-glibc p) target #:xbinutils (cross-binutils target) #:libc (cross-bootstrap-libc target)))) - `(("cross-gcc" ,(package + `(,@(%final-inputs) + ;; As versions for gcc and cross-gcc can differ, make sure to have + ;; cross-gcc behind gcc in CPLUS_INCLUDE_PATH. + ("cross-gcc" ,(package (inherit xgcc) (search-paths ;; Ensure the cross libc headers appears on the @@ -154,8 +157,7 @@ (define (package-with-relocatable-glibc p) (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) (package-search-paths gcc))))) - ("cross-binutils" ,(cross-binutils target)) - ,@(%final-inputs))) + ("cross-binutils" ,(cross-binutils target)))) `(("libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") ("gcc" ,(gcc-for-bootstrap glibc)) @@ -395,10 +397,15 @@ (define %binutils-static ((#:configure-flags flags _ ...) flags))) #:make-flags - (match (memq #:make-flags (package-arguments binutils)) - ((#:make-flags flags _ ...) - flags) - (_ #~'())) + #~(append + #$(if (target-hurd64?) + #~'("lt_cv_prog_compiler_static_works=yes" + "lt_cv_prog_compiler_static_works_CXX=yes") + #~'()) + #$(match (memq #:make-flags (package-arguments binutils)) + ((#:make-flags flags _ ...) + flags) + (_ #~'()))) #:strip-flags #~'("--strip-all") #:phases #~(modify-phases %standard-phases @@ -642,6 +649,9 @@ (define* (make-guile-static guile patches) #$@(if (target-hurd?) #~("--disable-jit") + #~()) + #$@(if (target-hurd64?) + #~("lt_cv_prog_compiler_static_works=yes") #~()))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 0c8fc7296c..5617e6dd68 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Mathieu Othacehe ;;; Copyright © 2023, 2024 Efraim Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,8 @@ (define-module (guix platforms x86) x86_64-linux-x32 i686-mingw x86_64-mingw - i586-gnu)) + i586-gnu + x86_64-gnu)) (define i686-linux (platform @@ -71,3 +73,10 @@ (define i586-gnu (system "i586-gnu") (rust-target "i686-unknown-hurd-gnu") (glibc-dynamic-linker "/lib/ld.so.1"))) + +(define x86_64-gnu + (platform + (target "x86_64-pc-gnu") + (system "x86_64-gnu") + (rust-target "x86_64-unknown-hurd-gnu") + (glibc-dynamic-linker "/lib/ld-x86-64.so.1"))) diff --git a/guix/utils.scm b/guix/utils.scm index f161cb4ef3..e100c03365 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Philip McGrath -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2024 Herman Rimm @@ -94,6 +94,8 @@ (define-module (guix utils) target-linux? target-hurd? system-hurd? + target-hurd64? + system-hurd64? target-mingw? target-x86-32? target-x86-64? @@ -716,6 +718,17 @@ (define* (system-hurd?) "Is the current system the GNU(/Hurd) system?" (and=> (%current-system) target-hurd?)) +(define* (target-hurd64? #:optional (target (or (%current-target-system) + (%current-system)))) + "Does TARGET represent the 64bit GNU(/Hurd) system?" + (and (target-hurd?) + (target-64bit? target))) + +(define* (system-hurd64?) + "Is the current system the 64bit GNU(/Hurd) system?" + (and (system-hurd?) + (target-64bit? (%current-system)))) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target From patchwork Sun Nov 24 07:54:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33817 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 912BF27BBEC; Sun, 24 Nov 2024 07:58:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 E157127BBE2 for ; Sun, 24 Nov 2024 07:58:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UP-0000AT-68; Sun, 24 Nov 2024 02:57:05 -0500 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 1tF7UN-00009r-29 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 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 1tF7UM-0002Jq-PD; Sun, 24 Nov 2024 02:57:02 -0500 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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; b=noolP12PBljH0kLcLJ+o4z0e4txBlAeHpuY+wXlZWGvo4iQ06VzJVkDZ0WlDTIpslgRxhw84HDzcUs1iE8mUkErVmfQaxnzOTFTxPSZ2toKdN/jgllSKn3VHgxd6vBXB3Akg8lSWnGeHIr937h+fekUj6r+rJFEzxZHmr8/2A0yE6yiMt6fMrBBmSaMejHIiRFI0//7uJ2k514DLUAX7DSSZ/ZGGPJ+sTuEFt5nXgR6ZXjY62zw9QEsvvomDsBT/BsyUT6Em1v0rNouDkhEqZjYTy3yDU/doxM47LNe8lcN8lkzW36LeYQ2oUZNPvWSTQoOn1X5RrMRY+37qgVx+zA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UM-0004ei-Im; Sun, 24 Nov 2024 02:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 05/58] gnu: cross-libc: Support cross-building for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497117418 (code B ref 74290); Sun, 24 Nov 2024 07:57:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TW-0004Wq-GT for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TJ-0004Th-Kf for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500 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 1tF7TE-0001sM-9p; Sun, 24 Nov 2024 02:55:52 -0500 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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; b=UCNwWsfHQ5FwIyh7UYLQ fRQDzVZJXqe4K+nMADimaosAF4KT0rg+NdDUsMkSnglSjMG5SlJrn8ERHSNC3kioVJC7iAA6cNxtz JvWae1q9vROyH3pENZNMjK+BsGWnfs7OT9a3sskDRXV+8v6ryun0t/jSaDozRqRCnLe1EikCGMyBL Ka+uJw+Lx7PXmFFwshyfrn5enwJ5VuZgrTRVjZwHB5P9NXz9xjeJbiR6YZ6cOF8G443nyhMJTt3ij ryd6QOqUwN7eyt2p+BLFrNGEuQxJtPk21Fbh94MFaq8asQoh3TyhW4EfgV0x/WGqJuivVb9QjoLuV vZuSIu5wkHozqg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:28 +0100 Message-ID: <1f12ffca4c4a35a169686b44412d2d377177a76e.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/base.scm (glibc)[arguments]: When building for the Hurd, in phase "create-machine-symlink", do not assume CPU is i386, also cater for x86_64. * gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise. Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812 --- gnu/packages/base.scm | 9 +++++++-- gnu/packages/bootstrap.scm | 2 +- gnu/packages/cross-base.scm | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 90c25b54e1..02ef71f20d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1079,7 +1079,7 @@ (define-public glibc (string-append locale "/C.UTF-8"))))) ,@(if (target-hurd?) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -1089,7 +1089,12 @@ (define-public glibc (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 33cbaa30ae..27798fe278 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -311,7 +311,7 @@ (define* (glibc-dynamic-linker gnu-triplet->nix-system) (%current-system)))) "Return the name of Glibc's dynamic linker for SYSTEM." - ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc. + ;; See the appropriate 'shlib-versions' file in libc. (let ((platform (false-if-platform-not-found (lookup-platform-by-system system)))) (cond diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 83672ab383..4961b3b4c0 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -738,7 +738,7 @@ (define* (cross-libc* target (delete 'install-utf8-c-locale) ,@(if (target-hurd? target) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -748,7 +748,11 @@ (define* (cross-libc* target (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) From patchwork Sun Nov 24 07:54:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33826 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 57CE927BBEC; Sun, 24 Nov 2024 07:59:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 B268127BBF1 for ; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UP-0000Af-89; Sun, 24 Nov 2024 02:57:05 -0500 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 1tF7UN-00009z-JV for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 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 1tF7UN-0002Jy-BB for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 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=Qt95m4uKHM+54AY3ttIyfuvxneu8yjJgxxbpcdIZ4Bs=; b=TfjSlcUDAUlSxc4y8x36rBGwj/w/wn91/WfAkrXw5nC7slZ97Hc20U/obY1qHFZspmMI9yG5qBFS9hQNXOp+zGzVc9K2r6mC0isUSrBAQX/9QdTBEsQ8A2qRUxk6oA3AH1n+kZd34P+Y2O9TEEsNzBJTmnh//z/pbWWZajEp9H0ZV4DJn+l09zkU4JGGVKF/R2lSFibjrGLS18WIUcPuyLd6bXAV0isN9N6lihDH7zNDB/gxo9GdEfOfPScN9YdwU7B+OT0c20dWhO6qWk7MDdvoyKNBOGAqmQXZkfpJJBUj1puWh25LpUOXSS7rTll95CCoXWJB1F/Lg0Fwtqd2+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UN-0004ex-5l for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 06/58] gnu: bash-minimal: Support [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497117429 (code B ref 74290); Sun, 24 Nov 2024 07:57:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TW-0004Wy-Ur for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TM-0004U1-85 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:00 -0500 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 1tF7TH-0001tn-27; Sun, 24 Nov 2024 02:55:55 -0500 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=Qt95m4uKHM+54AY3ttIyfuvxneu8yjJgxxbpcdIZ4Bs=; b=MHNVkA6Rb518Kpvbs8yz lIHWnJNxXiBx+lDTfNQ0StYEA9a9o234PQl4uItNIPg+oKOlUx2SAIL1v5ER18Em/kjfra4uEwG3M 3X6/gxHJqP/QPoyOInrm19teUrSmDu+o2tS69BiInqNVyb+2xwc+DsWM91yWHjjEe2PCJPhlr/2HM gETHFK4SJmq1HphZ/S1z2Mf1sf0xrMarKzGArGAwSKaSZl/fTDisIE5W+LkVVuiAtv0aTg8s7Zp0L R2IdUzb0WAg3BnARNsD2XA1qs2X/pa9zC7Kvchl0G+XtPmaWSdYwqKawVEyilyqxzhQhrFSkXtchl qgplOqi1DZh3NA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:29 +0100 Message-ID: <36e7173c950cda9f0e4e2c2e207cb2cc92abc8c0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/bash-minimal.scm (bash)[arguments]: When building for the 64bit hurd, or cross-building, use "CFLAGS=-g -O2 -Wno-implicit-function-declaration". Change-Id: I1356c0aeac303bdf0254c28815716c83884008a0 --- gnu/packages/bash.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 93641a78d5..56918d79bd 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2024 Oleg Pykhalov +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -251,6 +252,13 @@ (define-public bash-minimal ;; modules and related code. "ac_cv_func_dlopen=no" + ,@(if (or (target-hurd64?) (%current-target-system)) + ;; gcc-14 implictly uses -Wimplicit-function-declaration + ;; which together with -Werror causes: + ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’; + '("CFLAGS=-g -O2 -Wno-implicit-function-declaration") + '()) + ,@(if (%current-target-system) '("bash_cv_job_control_missing=no" "bash_cv_getcwd_malloc=yes") From patchwork Sun Nov 24 07:54:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33789 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 C3C2E27BBEA; Sun, 24 Nov 2024 07:57:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8A42727BBE2 for ; Sun, 24 Nov 2024 07:57:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UQ-0000Ay-OZ; Sun, 24 Nov 2024 02:57:06 -0500 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 1tF7UO-0000A8-4d for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:04 -0500 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 1tF7UN-0002K4-Sf for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 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=u7ZcwCvfIo4RA0wyM8D7UsyTx3DsVj1L+LGAlaX8E4Y=; b=iJDnQDBlEY283OT1QWxMZTa1RU0WtVoYtUizU1vxM5Uhx8leKcpseqX3AEIFzUfTrj2rn1DtrEeDnkY8kxqZdP9ir4tPAjdHBXtKkSTBPFpC4DekGbPyRA+A64VzIjOO7EMluwqmqLRVKugG2qXOQSRaOpoTwwUsKDF1IRcilShuI4BadlACNxhzDVnWMKMWilQEVoOSCWXBQjKYh2JaTQMM1cIVHEypoP0J8Sc9Re27woEoaxP9zP+i2A4EN11GANHEmMkVsYEwdYWzvl/Jd9X7LgJHTL8irgSqgmdhxLkl6sQNXnMnWujaPyQ1rYC6+7G48ylpyaPgXry96OnJ9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UN-0004f5-MW for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 07/58] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497117437 (code B ref 74290); Sun, 24 Nov 2024 07:57:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TX-0004X4-A8 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TO-0004U6-Ja for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:03 -0500 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 1tF7TJ-0001uc-DV; Sun, 24 Nov 2024 02:55:57 -0500 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=u7ZcwCvfIo4RA0wyM8D7UsyTx3DsVj1L+LGAlaX8E4Y=; b=PWezY+0lZt6O7HHHe0Jw p0ZBu/Ls6ZkLUkVOoz2H51mmeJWXD8C84+B2lVR9iONZDVZ9T9zjSisqeMCCR/sc9gOnFS/UvOmZc uV3KD3SYu+O74l+PKlhcRPMZ3T7UJy6i97+RB9ovqAE1pRgAePbFZkMtqEbEXn9XPU8Q2JDju7hct /x970WcBQpHq94LpEbjfzMQ3zuhqO0JzGMyt6liZExhB0VxLyFpQbx5U27juOtEVs9YygIJ7jlWL1 GeTC539KmjCcMHPlpU8hK3KJVfQxhlmBxjpBpm/echfBi4TQEe4dfHvgwa0FphBqm+L9zu6BiNFsR SABKI9YXlpMhEw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:30 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/elf.scm (elfutils)[arguments]: When building for a 64bit Hurd, set #:make-flags. Change-Id: I00abf360a7de5b1f78c1e912f0dcf27c62c1af68 --- gnu/packages/elf.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 119f8d13dd..81a753a483 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Leo Le Bouter ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +86,10 @@ (define-public elfutils "--disable-libdebuginfod" "--disable-debuginfod") + ,@(if (target-hurd64?) + '(#:make-flags '("core-file_no_Werror=yes")) + '()) + ;; Disable tests on MIPS and PowerPC (without changing ;; the arguments list on other systems). ,@(if (any (cute string-prefix? <> (or (%current-target-system) From patchwork Sun Nov 24 07:54:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33787 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 8DF1C27BBEC; Sun, 24 Nov 2024 07:57:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 9400027BBE2 for ; Sun, 24 Nov 2024 07:57:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UQ-0000Ax-OO; Sun, 24 Nov 2024 02:57:06 -0500 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 1tF7UO-0000AG-LS for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:04 -0500 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 1tF7UO-0002KD-Cu; Sun, 24 Nov 2024 02:57:04 -0500 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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=tpRXjIsAIcBi3POTXgpz8ue9QNftTE5D9lWsWg742hg3yqlif5KeQo9PO0BMJPHT+KJmmwXOpjtkSPQS5M1fmvWPK7RgcjcZgbNEzVs8vC8k6mF/cQkSn1hsZR/fMiTiGOD9AOcFShT68b94ZGqPhTkngKffwrVQFWVoMcllnVKbh1EkgfyvRjyoGMnaBuBwl2S06K+VI1tQJNAfY/Y06CwendDB7BJ9o1IkL/zLnh/q9BUEv5VMYco0zSwyzhEqmawcvUN4/EpEX1gyShphQ/vtTpu97t6G4vpLtpe0LC7s9fQLGVhlXZ0LP5G01440Cbg+g899PlJBQ9XLK1m85g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fC-6r; Sun, 24 Nov 2024 02:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 08/58] gnu: grep: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497217445 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:12 +0000 Received: from localhost ([127.0.0.1]:60673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TX-0004XC-MN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TP-0004UO-KE for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:04 -0500 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 1tF7TK-0001uj-Dg; Sun, 24 Nov 2024 02:55:58 -0500 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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=hlnrBJI0O5Mc82RQm0i1 eC5rL2W5Tu1Cue1nPX25O8n4Af/YRT31Q7U/28zeVrbj+2XRbO53uSIBjcY6kxq1aq9AVfkQOsE20 EVbv4fqBmtJ7EtmdgNJqjRn4M1p1d0jIhaY7RMeDeOWOTscUoZlI2WGQb8pHjDGsu7TmK11PXJz0B +HJMW6h6NHOhaYeFTiFUjIKjtM+Qlk3cayQ++FP7lj/pMJ+TvyE4PzjyFMc8XUVpeubkfyqyIxrfS cRTADOWsxd9BQXpn2nmWAeQr6JjpC56SLW5NI2SUllTvHqkIDBdXCCVOAgzYrEopVIonh0bVIp3of v2DzK7UZ/9pTUg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:31 +0100 Message-ID: <28e3737472cbdbe6cd9d3771706568ee62fc0501.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 02ef71f20d..010be631d7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -154,6 +154,13 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + #~()) #$@(if (system-hurd?) #~((add-before 'check 'skip-test (lambda _ From patchwork Sun Nov 24 07:54:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33823 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 171D527BBEA; Sun, 24 Nov 2024 07:59:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 9166B27BBE2 for ; Sun, 24 Nov 2024 07:59:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UR-0000BC-9m; Sun, 24 Nov 2024 02:57:07 -0500 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 1tF7UP-0000AZ-7f for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 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 1tF7UO-0002KJ-V8; Sun, 24 Nov 2024 02:57:04 -0500 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=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=vr+PkymPdGijuVVetb06eDnGD8A6C4oYuf89dGJqa8d2SmtVDdJM5zF+QzEesG4CYmrBR5kiKn7oBvbqdyVnvM1f1kcgof2n0YQ/UodTqG6DHRadWOo27XB1IrrmvFoyI98DAh8gr3ffOV0ZxIjiD30pXgXT8Hj1hau9gV/6h2lnaD3qobVD1E8gZqrkX3imQ0N6sLcqaVmVtGXZWf+pc1flI1ElXVs6z6ChzxpsmzvEumFB5lvX36hhGg21hRN8QGI/KHTL56vlmNOd1A7Gz42jqkf8APZa82H84CxVLcF9TWv5IGsD2OZ8DAtBOpnlSpD/mv2/+HkhQ4WjvzhhIg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fM-PN; Sun, 24 Nov 2024 02:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 09/58] gnu: patch: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497317454 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:13 +0000 Received: from localhost ([127.0.0.1]:60675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TY-0004XK-1a for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TQ-0004Ud-L5 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:05 -0500 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 1tF7TL-0001uq-Ec; Sun, 24 Nov 2024 02:55:59 -0500 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=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=St8+xdROngfpQe9VCBNw xqnp/FyF8ruMeV0we7K24LK0Ephf/iZwojPxgm591iIy9+F02pM87uGhqWCykk1u0MSKISHzC0SFx rjCsND6VJv4lSj75zVxT/ezN17uX35Vke97k/IRLxp18jNrLtdoiiZts7sPGdaVG19yjN2vYmwB/0 CFFrUQ6XKvcO6zTVr74amXS5pQ0fDMPTq9kGHGXzzcozBpbFiyETP70S7YYlHl/GF1tmRHaH2Dh4Q 9ymS7rgXQk8hdYazBBYKz1PZx8IOYxng35GZnHJtjwdv6eQ3FRb0wRqelGgaIwzcC0rAQ7FsQug3L z9GMHwBsCz0bWw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:32 +0100 Message-ID: <782e6888544ea859719fdb5cfa9e5a0e16b8adb4.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/base.scm (patch)[arguments]: When building for the 64bit Hurd, set #:configure-flags. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 49 ++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 010be631d7..83f8c0d9e9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -339,27 +339,34 @@ (define-public patch "1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz")) (patches (search-patches "patch-hurd-path-max.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (add-after 'unpack 'copy-gnulib-sources - (lambda _ - ;; XXX: We copy the source instead of using 'gnulib' as a - ;; native input to avoid introducing a dependency cycle. - (copy-recursively #+gnulib "gnulib") - (setenv "GNULIB_SRCDIR" - (string-append (getcwd) "/gnulib/src/gnulib")))) - (add-after 'copy-gnulib-sources 'update-bootstrap-script - (lambda _ - (copy-file "gnulib/src/gnulib/build-aux/bootstrap" - "bootstrap"))) - (add-after 'unpack 'patch-configure.ac - (lambda _ - (substitute* "configure.ac" - ;; The gnulib-provided git-version-gen script has a plain - ;; shebang of #!/bin/sh; avoid using it. - (("build-aux/git-version-gen" all) - (string-append "sh " all))))))))) + (let ((arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-gnulib-sources + (lambda _ + ;; XXX: We copy the source instead of using 'gnulib' as a + ;; native input to avoid introducing a dependency cycle. + (copy-recursively #+gnulib "gnulib") + (setenv "GNULIB_SRCDIR" + (string-append (getcwd) "/gnulib/src/gnulib")))) + (add-after 'copy-gnulib-sources 'update-bootstrap-script + (lambda _ + (copy-file "gnulib/src/gnulib/build-aux/bootstrap" + "bootstrap"))) + (add-after 'unpack 'patch-configure.ac + (lambda _ + (substitute* "configure.ac" + ;; The gnulib-provided git-version-gen script has a plain + ;; shebang of #!/bin/sh; avoid using it. + (("build-aux/git-version-gen" all) + (string-append "sh " all)))))))))) + (if (target-hurd64?) + (substitute-keyword-arguments arguments + ((#:configure-flags flags '()) + #~(list "--disable-threads" + "gl_cv_func_working_mktime=yes"))) + arguments))) (native-inputs (list autoconf automake bison ed)) (properties '())))) From patchwork Sun Nov 24 07:54:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33828 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 7326327BBE2; Sun, 24 Nov 2024 07:59:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 97D7327BBED for ; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UR-0000BE-Ac; Sun, 24 Nov 2024 02:57:07 -0500 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 1tF7UQ-0000Aq-3w for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:06 -0500 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 1tF7UP-0002KS-RR for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 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=Umy2vP7LX8xbEzRUFrHWzJKLrx1O3ko1tosisY6YVGc=; b=gH8V55nCdhZGbzkrsjux9mgfGLPAhQiKMdtEaSS1+No84qivUfGtEgg5FqxSAnATL+ZYXcC8n+OZSP2plBefXrv1ryD+9rlGBMUhYLE1NfwslzP6Wl8BWzWzYhZ3IQ/O9TPMZv03dt0bdq2KYcm2iCY9yhgUmvBdN0JotnPFlWh7HOi/zgBbstTKJeiciwr3lF+alBkYzfpSelQD3Bl5ap19RmowoUTLxFKQD0CBWJPZpRvciZDRt4EeXIpVeI8IYabbw3y9RhwHD7cvYIBMNdeBMQkrdel2icPnw8yfivkZTym6Xur9lvPMIqnMuycJhzgzh2ezz4+pXCaHep1frA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fc-Gb for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 10/58] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497417463 (code B ref 74290); Sun, 24 Nov 2024 07:57:05 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:14 +0000 Received: from localhost ([127.0.0.1]:60677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TY-0004XT-WF for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TR-0004Ue-EY for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:06 -0500 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 1tF7TM-0001ux-8F; Sun, 24 Nov 2024 02:56:00 -0500 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=Umy2vP7LX8xbEzRUFrHWzJKLrx1O3ko1tosisY6YVGc=; b=qxAX2ySeyrXLy/7JuP8v d2WNtQ6QQm82Meb5rhOQNlEdmhDa9enP8XV3t8/6xFcOUtQZLxQlzSCA4a08cdww89T+5q84rUw2n THt8dKRe8Ej7XQBvpE0FV+uAWlC1uNz2DERdQ5jutFsyy95kPGKXmNV1c7ySBebkJR/u8tQCBC2tk Is7eSEU8ZQOovwgo9H5SG8X5jR5rlrYjTwo6z3T3Yn5DPujlh8gasIdhglyvfZcwux1Sfv5K0Pbll Z+lncMy+bN6MazgFl4Pjwkqxhs/HzrMCri08w+g97SNrDzJQIzYwaYiBBtxi5cbHdsav0do1ulktM Eh1CiwLRQfn9sA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:33 +0100 Message-ID: <14b9d24dbbdbdaa7683c299ef3aaeb4d89588a25.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/libxcrypt-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/crypto.scm (libxcrypt)[arguments]: When building for the 64bit Hurd, use it in new phase `apply-hurd64-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 13 +++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5e05fc9d10..0753002f75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1726,6 +1726,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ + %D%/packages/patches/libxcrypt-hurd64.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libwpd-gcc-compat.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2a298c4caf..9ef1a53fa6 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1661,6 +1662,18 @@ (define-public libxcrypt (build-system gnu-build-system) (native-inputs (list perl)) + (arguments + (if (target-hurd64?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))))) + '())) (synopsis "Extended crypt library for descrypt, md5crypt, bcrypt, and others") (description diff --git a/gnu/packages/patches/libxcrypt-hurd64.patch b/gnu/packages/patches/libxcrypt-hurd64.patch new file mode 100644 index 0000000000..9fc3018539 --- /dev/null +++ b/gnu/packages/patches/libxcrypt-hurd64.patch @@ -0,0 +1,38 @@ +Upstream-status: Taken from upstream: + + +From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sun, 14 Jul 2024 13:13:07 +0200 +Subject: [PATCH] Add binary compatibility for x86_64 GNU/Hurd +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + + +diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in +index 88ea911..a56b7bf 100644 +--- a/lib/libcrypt.map.in ++++ b/lib/libcrypt.map.in +@@ -43,5 +43,5 @@ fcrypt - GLIBC_2.0 + %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 + %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 + %chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 +-%chain GLIBC_2.36 ++%chain GLIBC_2.36 GLIBC_2.38 + %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 +diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver +index 8478077..c5a5bf2 100644 +--- a/lib/libcrypt.minver ++++ b/lib/libcrypt.minver +@@ -51,6 +51,7 @@ + #VERSION SYSTEM CPU_FAMILY PREPROCESSOR_CHECK + + # GNU Hurd ++GLIBC_2.38 gnu x86_64 + GLIBC_2.2.6 gnu i[3-9]86 + ERROR gnu . + +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Sun Nov 24 07:54:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33788 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 D4BC927BBE2; Sun, 24 Nov 2024 07:57:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 75D8B27BBEB for ; Sun, 24 Nov 2024 07:57:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7US-0000CM-9M; Sun, 24 Nov 2024 02:57:09 -0500 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 1tF7UQ-0000B1-T8 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:07 -0500 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 1tF7UQ-0002KZ-Df; Sun, 24 Nov 2024 02:57:06 -0500 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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=EQWgAfz9wAQso6xJpLM4kEbDs/inBiuzLhKj97oTcF3pRpgrU31q818604p7PnrV3y/aZ2c6lTyVReaeLRs58HepQy5B4R2hEt26UkBpaMSTTfqNDCWLigZJhuGCEkba5fyomHpTgizDy1c6FL56Dhby13ynKZNAhVuO/ILMtFsL1sENDhFVCvZTI02wN05iDLnbxfATGnsqHFwyxomFxeXjCRwn+yi3qpSCucf3elKn22GHGnx1kUY4WVUntxoYe2x6cLTtXph+Zoi0A56/aKn58N1gKNhZdrALbmEh7HNWeSs536u3qxp33OmUALWbTrQ2DFYGr/yD5D/6fPgGdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UQ-0004fq-79; Sun, 24 Nov 2024 02:57:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 11/58] gnu: libstdc++: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497417476 (code B ref 74290); Sun, 24 Nov 2024 07:57:06 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:14 +0000 Received: from localhost ([127.0.0.1]:60681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TZ-0004Xb-P8 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TS-0004Ur-93 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:06 -0500 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 1tF7TN-0001v6-2X; Sun, 24 Nov 2024 02:56:01 -0500 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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=IDPQp/ckNmHado+R6ZI7 pX9rm5FdCHs7kaEunE32nkQ85lkmyVeJILBD8m8MiPp1IeG9/DeodpHwwawnz/OVKWA6Eu0DVGoVD spq0Owrpw8htoKWQuLlI08m5NbVtesv8XQKQg3qg7NU6F6iLgcqGhJMdeNpITcuc0089GYx54TbyR xCTrzw3E0bcRyNEo+130ymH23FI9FEzRttxSggXpAwePONPvmDRVG20gE0W5aNIr+3tMWyI4/T5uH yCiiH34xzLhrGc71LpxpGK/xzHXUcNRMjOjEsHAKeLhE5JPom0dde/QVlez3d3xC4aYBVXbE4UVOX f5wWksLtw6z+jQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:34 +0100 Message-ID: <7747b95f6a663fee3fa27e2c2188b48abf466077.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/gcc.scm (make-libstdc++)[arguments]: When building for the 64bit Hurd, add stage patch-hurd64. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/gcc.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c9e475b676..64ba37fd69 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1024,7 +1024,15 @@ (define-public (make-libstdc++ gcc) (("/lib64") "/lib"))))) (add-before 'configure 'chdir (lambda _ - (chdir "libstdc++-v3")))) + (chdir "libstdc++-v3"))) + #$@(let ((version (package-version gcc))) + (if (target-hurd64?) + #~((add-after 'unpack 'patch-hurd64 + (lambda _ + (substitute* "libstdc++-v3/src/c++20/tzdb.cc" + (("#if ! defined _GLIBCXX_ZONEINFO_DIR") + "#if __GNU__ || ! defined _GLIBCXX_ZONEINFO_DIR"))))) + '()))) #:configure-flags '`("--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" From patchwork Sun Nov 24 07:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33790 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 3D89B27BBEA; Sun, 24 Nov 2024 07:57:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8C7BC27BBE2 for ; Sun, 24 Nov 2024 07:57:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UW-0000Ew-Nl; Sun, 24 Nov 2024 02:57:12 -0500 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 1tF7US-0000Bu-0c for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 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 1tF7UR-0002Kn-OA; Sun, 24 Nov 2024 02:57:07 -0500 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=/7669s/vPl4u/i/CZrXyROJfSDNJk9YoFJcrZnxakcY=; b=rsWthIt8OifJO7zE3CTC1fN/l+8MlQvkg9nEQEBWEYVa6lEkXtlgkIXC99+3kuDyuahuXCCVrYxwHp+FbxreQBtUEclfY+cBjKV12lumkB1J6wNhctvmpk5JmC0uxbxy7Jok7hQ0mKkIXMUraWjrBwEONTIiPnO7ZM4dJcsbgj9dXQ1J+Zv3rS9Pp/M1MzILSjYvCsS0vzGLNQQdkwil2Q+H2INEkrjInsPIEJ5qSjp3G355hWpC1JcU+JM/OCWVGCb0++WKlMgTluBdpWuGggrqw8AmqzbRp0VlxbUJcZNJL8eNp8sigUdjEWpvpzAA6jHtMieKF3VleQ+LoE8ZLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UR-0004gD-HI; Sun, 24 Nov 2024 02:57:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 12/58] gnu: glibc/hurd: Add patches for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497717521 (code B ref 74290); Sun, 24 Nov 2024 07:57:07 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:17 +0000 Received: from localhost ([127.0.0.1]:60687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Xx-Vf for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TT-0004V5-BI for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:09 -0500 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 1tF7TO-0001vr-4X; Sun, 24 Nov 2024 02:56:02 -0500 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=/7669s/vPl4u/i/CZrXyROJfSDNJk9YoFJcrZnxakcY=; b=BhWOGhdJVzaOcoUgUqr3 B01ZgEqu6HbpZv6NaEEQYbXL7AiI7vvtbeBbspdNH7ZSbYkvZNgwXv4YS3PbxYAiLM8Tqws27iXqz nWabcLyOHy3yildVmVdjnO9GvmuMgEUJtdS8Y+9tj3ys39a9wY2urcKpwsnET8PgAWtwZ2a+NcboU YD5pnBe7r7V2JU6j9TAydXC5+RUBiLuuX4YsUhFLVls882IaWopQwRHuYCWCKTmaZM1vxlFV66HH8 VeFF7MRrOprhosG4do438nzUWXuROqkYhRbnfQUAIZHyS1MHj/70F+jbwl0Te1B70PQ7Qh1rhUx3c oIREuHA6SRWZ/g==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:35 +0100 Message-ID: <7c8d9bb229538bd21e91c0beb562d26bd4fabf98.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 These patches fix: * Statically linked tar to hang/segfault upon issuing the "--mtime=@1" warning; this is also applicable for the 32bit Hurd using glibc-2.39! See . * Shell replacement problems for the 64bit Hurd. See . * Findutil's gnulib-tests/test-sigaction failure. * gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch, gnu/packages/patches/glibc-hurd64-fault.patch, gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch, gnu/packages/patches/glibc-hurd64-sgms-context.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/base.scm (glibc/hurd): Use them. Change-Id: I9ee65983876cd22ad1dc01aabb41a34074631599 --- gnu/local.mk | 4 + gnu/packages/base.scm | 12 +- .../glibc-hurd-pthread_setcancelstate.patch | 92 ++++ gnu/packages/patches/glibc-hurd64-fault.patch | 32 ++ .../glibc-hurd64-intr-msg-clobber.patch | 62 +++ .../patches/glibc-hurd64-sgms-context.patch | 505 ++++++++++++++++++ 6 files changed, 706 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch create mode 100644 gnu/packages/patches/glibc-hurd64-fault.patch create mode 100644 gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch create mode 100644 gnu/packages/patches/glibc-hurd64-sgms-context.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0753002f75..f15272f25c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1437,7 +1437,11 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ %D%/packages/patches/glibc-hurd-mach-print.patch \ + %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-hurd64-fault.patch \ + %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ + %D%/packages/patches/glibc-hurd64-sgms-context.patch \ %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 83f8c0d9e9..80e53c2e52 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1588,7 +1588,17 @@ (define-public which command.") (license gpl3+))) ; some files are under GPLv2+ -(define-public glibc/hurd glibc) +(define-public glibc/hurd + (package/inherit glibc + (source + (origin + (inherit (package-source glibc)) + (patches + (append (origin-patches (package-source glibc)) + (search-patches "glibc-hurd-pthread_setcancelstate.patch" + "glibc-hurd64-fault.patch" + "glibc-hurd64-intr-msg-clobber.patch" + "glibc-hurd64-sgms-context.patch"))))))) (define-public glibc/hurd-headers (package/inherit glibc/hurd diff --git a/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch new file mode 100644 index 0000000000..1d7c81b98e --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch @@ -0,0 +1,92 @@ +Upstream-status: Taken from . + +This is needed for the 64bit Hurd statically linked tar non to hang when +issuing a warning. + +since the move of libpthread functions to libc, glibc dropped the use +of __libc_ptf_call. But htl hasn't made the move yet, so we have to use +__libc_ptf_call there for now. + +Index: glibc-2.36/misc/error.c +=================================================================== +--- glibc-2.36.orig/misc/error.c ++++ glibc-2.36/misc/error.c +@@ -240,7 +240,8 @@ __error_internal (int status, int errnum + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + #endif + + flush_stdout (); +@@ -262,7 +263,7 @@ __error_internal (int status, int errnum + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +@@ -306,7 +307,9 @@ __error_at_line_internal (int status, in + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), ++ 0); + #endif + + flush_stdout (); +@@ -336,7 +339,7 @@ __error_at_line_internal (int status, in + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +Index: glibc-2.36/libio/iopopen.c +=================================================================== +--- glibc-2.36.orig/libio/iopopen.c ++++ glibc-2.36/libio/iopopen.c +@@ -281,9 +281,10 @@ _IO_new_proc_close (FILE *fp) + do + { + int state; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + } + while (wait_pid == -1 && errno == EINTR); + if (wait_pid == -1) +Index: glibc-2.36/stdlib/fmtmsg.c +=================================================================== +--- glibc-2.36.orig/stdlib/fmtmsg.c ++++ glibc-2.36/stdlib/fmtmsg.c +@@ -124,7 +124,8 @@ fmtmsg (long int classification, const c + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + + __libc_lock_lock (lock); + +@@ -193,7 +194,7 @@ fmtmsg (long int classification, const c + + __libc_lock_unlock (lock); + +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + + return result; + } diff --git a/gnu/packages/patches/glibc-hurd64-fault.patch b/gnu/packages/patches/glibc-hurd64-fault.patch new file mode 100644 index 0000000000..24980e8c2a --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-fault.patch @@ -0,0 +1,32 @@ +Upstream-status: Taken from: . + +See . + +commit 11ad033e1c09c8b8e7bbaa72420f41ab8bcf0f63 +Author: Flavio Cruz +Date: Tue Jul 30 00:51:20 2024 -0400 + + x86_64 hurd: ensure we have a large enough buffer to receive exception_raise requests. + + Message-ID: + +diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c +index 5110c6030f..1fe973f54d 100644 +--- a/hurd/hurdfault.c ++++ b/hurd/hurdfault.c +@@ -121,7 +121,14 @@ faulted (void) + struct + { + mach_msg_header_t head; +- char buf[64]; ++ /* This is the size of the exception_raise request ++ * including mach_msg_header_t. ++ * See generated code in faultexc_server.c. */ ++#ifdef __LP64__ ++ char buf[112]; ++#else ++ char buf[64]; ++#endif + } request; + mig_reply_header_t reply; + extern int _hurdsig_fault_exc_server (mach_msg_header_t *, diff --git a/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch new file mode 100644 index 0000000000..600f89a711 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch @@ -0,0 +1,62 @@ +Upstream-status: Taken from . + +See , +and . + +Commited for 2.40 + +commit c8b4ce0b368115714bd4cce131e1683759471099 +Author: Samuel Thibault +Date: Sat Jul 13 17:00:55 2024 +0200 + + hurd: Fix restoring message to be retried + + save_data stores the start of the original message to be retried, + overwritten by the EINTR reply. In 64b builds the overwrite is however + rounded up to the 64b pointer size, so we have to save more than just + the 32b err. + + Thanks a lot to Luca Dariz for the investigation! + +diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c +index 2c2e7dc463..424c1fc700 100644 +--- a/hurd/intr-msg.c ++++ b/hurd/intr-msg.c +@@ -42,7 +42,10 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, + struct clobber + { + mach_msg_type_t type; +- error_t err; ++ union { ++ error_t err; ++ uintptr_t align; ++ }; + }; + union msg + { + +Taken from: + +Force putting save_data on the stack rather than in SSE register + +The signal management does not yet properly save SSE state, so that save_data +would get overwritten by signal handlers, notably leading to `` shell +replacement getting empty content because then the io_read RPC retry gets an +MIG_BAD_ARGUMENTS error. + +XXX: This is only temporary to fix the common shll replacement issue, and is +waiting for proper SSE state restoration. + +Index: glibc-2.38/hurd/intr-msg.c +=================================================================== +--- glibc-2.38.orig/hurd/intr-msg.c ++++ glibc-2.38/hurd/intr-msg.c +@@ -79,7 +79,7 @@ _hurd_intr_rpc_mach_msg (mach_msg_header + mach_msg_bits_t msgh_bits; + mach_port_t remote_port; + mach_msg_id_t msgid; +- struct clobber save_data; ++ volatile struct clobber save_data; + + if ((option & (MACH_SEND_MSG|MACH_RCV_MSG)) != (MACH_SEND_MSG|MACH_RCV_MSG) + || _hurd_msgport_thread == MACH_PORT_NULL) diff --git a/gnu/packages/patches/glibc-hurd64-sgms-context.patch b/gnu/packages/patches/glibc-hurd64-sgms-context.patch new file mode 100644 index 0000000000..7ae45542c1 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-sgms-context.patch @@ -0,0 +1,505 @@ +Upstream-status: Taken from . + +commit 88b771ab5e1169e746dbf4a990d90cffc5fa54ea +Author: Flavio Cruz +Date: Sat Feb 17 15:25:35 2024 -0500 + + Implement setcontext/getcontext/makecontext/swapcontext for Hurd x86_64 + + Tested with the tests provided by glibc plus some other toy examples. + Message-ID: <20240217202535.1860803-1-flaviocruz@gmail.com> + +diff --git a/sysdeps/mach/hurd/x86_64/Makefile b/sysdeps/mach/hurd/x86_64/Makefile +index 80cf2eb6dc..2b43f5d625 100644 +--- a/sysdeps/mach/hurd/x86_64/Makefile ++++ b/sysdeps/mach/hurd/x86_64/Makefile +@@ -3,3 +3,7 @@ ifeq ($(subdir),conform) + # (missing SA_NOCLDWAIT) + conformtest-xfail-conds += x86_64-gnu + endif ++ ++ifeq ($(subdir),stdlib) ++sysdep_routines += __start_context ++endif +diff --git a/sysdeps/mach/hurd/x86_64/__start_context.S b/sysdeps/mach/hurd/x86_64/__start_context.S +new file mode 100644 +index 0000000000..3cb4c6b5a9 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/__start_context.S +@@ -0,0 +1,49 @@ ++/* Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++/* This is the helper code which gets called if a function which is ++ registered with 'makecontext' returns. In this case we have to ++ install the context listed in the uc_link element of the context ++ 'makecontext' manipulated at the time of the 'makecontext' call. ++ If the pointer is NULL the process must terminate. */ ++ ++ ++ENTRY(__start_context) ++ /* This removes the parameters passed to the function given to ++ 'makecontext' from the stack. RBX contains the address ++ on the stack pointer for the next context. */ ++ movq %rbx, %rsp ++ ++ /* Don't use pop here so that stack is aligned to 16 bytes. */ ++ movq (%rsp), %rdi /* This is the next context. */ ++ testq %rdi, %rdi ++ je 2f /* If it is zero exit. */ ++ ++ call __setcontext ++ /* If this returns (which can happen if __sigprocmask fails) we'll ++ exit the program with the return error value (-1). */ ++ movq %rax,%rdi ++ ++2: ++ call HIDDEN_JUMPTARGET(exit) ++ /* The 'exit' call should never return. In case it does cause ++ the process to terminate. */ ++L(hlt): ++ hlt ++END(__start_context) +diff --git a/sysdeps/mach/hurd/x86_64/getcontext.S b/sysdeps/mach/hurd/x86_64/getcontext.S +new file mode 100644 +index 0000000000..ef431be1a3 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/getcontext.S +@@ -0,0 +1,68 @@ ++/* Save current context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++ENTRY(__getcontext) ++ /* Save the preserved registers, the registers used for passing ++ args, and the return address. */ ++ movq %rbx, oRBX(%rdi) ++ movq %rbp, oRBP(%rdi) ++ movq %r12, oR12(%rdi) ++ movq %r13, oR13(%rdi) ++ movq %r14, oR14(%rdi) ++ movq %r15, oR15(%rdi) ++ ++ movq %rdi, oRDI(%rdi) ++ movq %rsi, oRSI(%rdi) ++ movq %rdx, oRDX(%rdi) ++ movq %rcx, oRCX(%rdi) ++ movq %r8, oR8(%rdi) ++ movq %r9, oR9(%rdi) ++ ++ movq (%rsp), %rcx ++ movq %rcx, oRIP(%rdi) ++ leaq 8(%rsp), %rcx /* Exclude the return address. */ ++ movq %rcx, oRSP(%rdi) ++ ++ /* We have separate floating-point register content memory on the ++ stack. We use the __fpregs_mem block in the context. Set the ++ links up correctly. */ ++ ++ leaq oFPREGSMEM(%rdi), %rcx ++ movq %rcx, oFPREGS(%rdi) ++ /* Save the floating-point environment. */ ++ fnstenv (%rcx) ++ fldenv (%rcx) ++ stmxcsr oMXCSR(%rdi) ++ ++ /* Save the current signal mask with ++ * __sigprocmask(SIG_BLOCK, NULL, oSIGMASK(%rdi)); */ ++ leaq oSIGMASK(%rdi), %rdx ++ movq $0, %rsi ++ movl $SIG_BLOCK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ ++ /* Propagate %rax (and errno, in case). */ ++ ret ++PSEUDO_END(__getcontext) ++ ++weak_alias (__getcontext, getcontext) +diff --git a/sysdeps/mach/hurd/x86_64/makecontext.c b/sysdeps/mach/hurd/x86_64/makecontext.c +new file mode 100644 +index 0000000000..6990a7775c +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/makecontext.c +@@ -0,0 +1,119 @@ ++/* Create new context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++#include "ucontext_i.h" ++ ++/* This implementation can handle any ARGC value but only ++ normal integer parameters. ++ makecontext sets up a stack and the registers for the ++ user context. The stack looks like this: ++ +-----------------------+ ++ | next context | ++ +-----------------------+ ++ | parameter 7-n | ++ +-----------------------+ ++ | trampoline address | ++ %rsp -> +-----------------------+ ++ ++ The registers are set up like this: ++ %rdi,%rsi,%rdx,%rcx,%r8,%r9: parameter 1 to 6 ++ %rbx : address of next context ++ %rsp : stack pointer. ++*/ ++ ++/* XXX: This implementation currently only handles integer arguments. ++ To handle long int and pointer arguments the va_arg arguments needs ++ to be changed to long and also the stdlib/tst-setcontext.c file needs ++ to be changed to pass long arguments to makecontext. */ ++ ++ ++void ++__makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) ++{ ++ extern void __start_context (void) attribute_hidden; ++ greg_t *sp; ++ unsigned int idx_uc_link; ++ va_list ap; ++ int i; ++ ++ /* Generate room on stack for parameter if needed and uc_link. */ ++ sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp ++ + ucp->uc_stack.ss_size); ++ sp -= (argc > 6 ? argc - 6 : 0) + 1; ++ /* Align stack and make space for trampoline address. */ ++ sp = (greg_t *) ((((uintptr_t) sp) & -16L) - 8); ++ ++ idx_uc_link = (argc > 6 ? argc - 6 : 0) + 1; ++ ++ /* Setup context ucp. */ ++ /* Address to jump to. */ ++ ucp->uc_mcontext.gregs[REG_RIP] = (uintptr_t) func; ++ /* Setup rbx.*/ ++ ucp->uc_mcontext.gregs[REG_RBX] = (uintptr_t) &sp[idx_uc_link]; ++ ucp->uc_mcontext.gregs[REG_RSP] = (uintptr_t) sp; ++ ++ /* Setup stack. */ ++ sp[0] = (uintptr_t) &__start_context; ++ sp[idx_uc_link] = (uintptr_t) ucp->uc_link; ++ ++ va_start (ap, argc); ++ /* Handle arguments. ++ ++ The standard says the parameters must all be int values. This is ++ an historic accident and would be done differently today. For ++ x86-64 all integer values are passed as 64-bit values and ++ therefore extending the API to copy 64-bit values instead of ++ 32-bit ints makes sense. It does not break existing ++ functionality and it does not violate the standard which says ++ that passing non-int values means undefined behavior. */ ++ for (i = 0; i < argc; ++i) ++ switch (i) ++ { ++ case 0: ++ ucp->uc_mcontext.gregs[REG_RDI] = va_arg (ap, greg_t); ++ break; ++ case 1: ++ ucp->uc_mcontext.gregs[REG_RSI] = va_arg (ap, greg_t); ++ break; ++ case 2: ++ ucp->uc_mcontext.gregs[REG_RDX] = va_arg (ap, greg_t); ++ break; ++ case 3: ++ ucp->uc_mcontext.gregs[REG_RCX] = va_arg (ap, greg_t); ++ break; ++ case 4: ++ ucp->uc_mcontext.gregs[REG_R8] = va_arg (ap, greg_t); ++ break; ++ case 5: ++ ucp->uc_mcontext.gregs[REG_R9] = va_arg (ap, greg_t); ++ break; ++ default: ++ /* Put value on stack. */ ++ sp[i - 5] = va_arg (ap, greg_t); ++ break; ++ } ++ va_end (ap); ++} ++ ++ ++weak_alias (__makecontext, makecontext) +diff --git a/sysdeps/mach/hurd/x86_64/setcontext.S b/sysdeps/mach/hurd/x86_64/setcontext.S +new file mode 100644 +index 0000000000..99919ee2a8 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/setcontext.S +@@ -0,0 +1,96 @@ ++/* Install given context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++ENTRY(__setcontext) ++ /* Save argument since call will destroy it. */ ++ pushq %rdi ++ cfi_adjust_cfa_offset(8) ++ ++ /* Set the signal mask with ++ __sigprocmask (SIG_SETMASK, mask, NULL). */ ++ xorl %edx, %edx ++ leaq oSIGMASK(%rdi), %rsi ++ movl $SIG_SETMASK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ /* Pop the pointer into RDX. The choice is arbitrary, but ++ leaving RDI and RSI available for use later can avoid ++ shuffling values. */ ++ popq %rdx ++ ++ test %rax, %rax ++ jne L(pseudo_end) ++ ++ /* Restore the floating-point context. Not the registers, only the ++ rest. */ ++ movq oFPREGS(%rdx), %rcx ++ fldenv (%rcx) ++ ldmxcsr oMXCSR(%rdx) ++ ++ /* Load the new stack pointer, the preserved registers and ++ registers used for passing args. */ ++ cfi_def_cfa(%rdx, 0) ++ cfi_offset(%rbx,oRBX) ++ cfi_offset(%rbp,oRBP) ++ cfi_offset(%r12,oR12) ++ cfi_offset(%r13,oR13) ++ cfi_offset(%r14,oR14) ++ cfi_offset(%r15,oR15) ++ cfi_offset(%rsp,oRSP) ++ cfi_offset(%rip,oRIP) ++ ++ movq oRSP(%rdx), %rsp ++ movq oRBX(%rdx), %rbx ++ movq oRBP(%rdx), %rbp ++ movq oR12(%rdx), %r12 ++ movq oR13(%rdx), %r13 ++ movq oR14(%rdx), %r14 ++ movq oR15(%rdx), %r15 ++ ++ /* The following ret should return to the address set with ++ getcontext. Therefore push the address on the stack. */ ++ movq oRIP(%rdx), %rcx ++ pushq %rcx ++ ++ movq oRSI(%rdx), %rsi ++ movq oRDI(%rdx), %rdi ++ movq oRCX(%rdx), %rcx ++ movq oR8(%rdx), %r8 ++ movq oR9(%rdx), %r9 ++ ++ /* Setup finally %rdx. */ ++ movq oRDX(%rdx), %rdx ++ ++ /* End FDE here, we fall into another context. */ ++ cfi_endproc ++ cfi_startproc ++ ++ /* Clear rax to indicate success. */ ++ xorl %eax, %eax ++L(pseudo_end): ++ /* The following 'ret' will pop the address of the code and jump ++ to it. */ ++ ret ++PSEUDO_END(__setcontext) ++libc_hidden_def (__setcontext) ++ ++weak_alias (__setcontext, setcontext) +diff --git a/sysdeps/mach/hurd/x86_64/swapcontext.S b/sysdeps/mach/hurd/x86_64/swapcontext.S +new file mode 100644 +index 0000000000..79718a1fdd +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/swapcontext.S +@@ -0,0 +1,120 @@ ++/* Save current context and install the given one. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++/* int __swapcontext (ucontext_t *oucp, const ucontext_t *ucp); ++ ++ Saves the machine context in oucp such that when it is activated, ++ it appears as if __swapcontextt() returned again, restores the ++ machine context in ucp and thereby resumes execution in that ++ context. ++ ++ This implementation is intended to be used for *synchronous* context ++ switches only. Therefore, it does not have to save anything ++ other than the PRESERVED state. */ ++ ++ENTRY(__swapcontext) ++ /* Save the preserved registers, the registers used for passing args, ++ and the return address. */ ++ movq %rbx, oRBX(%rdi) ++ movq %rbp, oRBP(%rdi) ++ movq %r12, oR12(%rdi) ++ movq %r13, oR13(%rdi) ++ movq %r14, oR14(%rdi) ++ movq %r15, oR15(%rdi) ++ ++ movq %rdi, oRDI(%rdi) ++ movq %rsi, oRSI(%rdi) ++ movq %rdx, oRDX(%rdi) ++ movq %rcx, oRCX(%rdi) ++ movq %r8, oR8(%rdi) ++ movq %r9, oR9(%rdi) ++ ++ movq (%rsp), %rcx ++ movq %rcx, oRIP(%rdi) ++ leaq 8(%rsp), %rcx /* Exclude the return address. */ ++ movq %rcx, oRSP(%rdi) ++ ++ /* We have separate floating-point register content memory on the ++ stack. We use the __fpregs_mem block in the context. Set the ++ links up correctly. */ ++ leaq oFPREGSMEM(%rdi), %rcx ++ movq %rcx, oFPREGS(%rdi) ++ /* Save the floating-point environment. */ ++ fnstenv (%rcx) ++ stmxcsr oMXCSR(%rdi) ++ ++ ++ /* The function call destroys some registers, save ucp. */ ++ movq %rsi, %r12 ++ ++ /* Save the current signal mask and install the new one with ++ __sigprocmask (SIG_BLOCK, newset, oldset). */ ++ leaq oSIGMASK(%rdi), %rdx ++ leaq oSIGMASK(%rsi), %rsi ++ movl $SIG_SETMASK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ test %rax, %rax ++ jne L(pseudo_end) ++ ++ /* Restore destroyed register into RDX. The choice is arbitrary, ++ but leaving RDI and RSI available for use later can avoid ++ shuffling values. */ ++ movq %r12, %rdx ++ ++ /* Restore the floating-point context. Not the registers, only the ++ rest. */ ++ movq oFPREGS(%rdx), %rcx ++ fldenv (%rcx) ++ ldmxcsr oMXCSR(%rdx) ++ ++ /* Load the new stack pointer and the preserved registers. */ ++ movq oRSP(%rdx), %rsp ++ movq oRBX(%rdx), %rbx ++ movq oRBP(%rdx), %rbp ++ movq oR12(%rdx), %r12 ++ movq oR13(%rdx), %r13 ++ movq oR14(%rdx), %r14 ++ movq oR15(%rdx), %r15 ++ ++ /* The following ret should return to the address set with ++ getcontext. Therefore push the address on the stack. */ ++ movq oRIP(%rdx), %rcx ++ pushq %rcx ++ ++ /* Setup registers used for passing args. */ ++ movq oRDI(%rdx), %rdi ++ movq oRSI(%rdx), %rsi ++ movq oRCX(%rdx), %rcx ++ movq oR8(%rdx), %r8 ++ movq oR9(%rdx), %r9 ++ ++ /* Setup finally %rdx. */ ++ movq oRDX(%rdx), %rdx ++ ++ /* Clear rax to indicate success. */ ++ xorl %eax, %eax ++L(pseudo_end): ++ ret ++PSEUDO_END(__swapcontext) ++ ++weak_alias (__swapcontext, swapcontext) From patchwork Sun Nov 24 07:54:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33835 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 8021327BBE2; Sun, 24 Nov 2024 07:59:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 E5CCF27BBEA for ; Sun, 24 Nov 2024 07:59:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UT-0000DF-7i; Sun, 24 Nov 2024 02:57:09 -0500 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 1tF7UR-0000B8-7c for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:07 -0500 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 1tF7UQ-0002Kf-US for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:06 -0500 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=O2paMw05P4xg8gLY+nDmUoHYGnjWMhlOcVokJPZ7WCA=; b=CCFegwIfneruOo8hhVzO2t5tOnh+zDkjYzBYsv1Pr0VHCfIpEVmFSfkOJ7x7U+VC3UBjjNcPqUApVphvTZTUu8flrNeLrWkfJ5szXlvO+foXqvhpcuEFHAjm5FIxX/EGgmb6LhPNe5/neQ5TGOPO7HEltGb7LThvhjAkvXq3EZtgeZ8e1BDiU5OQ4Hl9aGV3DVMIckXp8KpGwgY6GF54yFf3QaFyxePomduoW7FS5IYBrPqfsVfR3tUxLB/gRpNg3ivhBq03IfjpMai6bd2ndBK+7Y34yLRBzZ80ZlgydFYsFcOdsZwjw0UjQApZrRiHuPpUV8ICqgMA6JjmvtzQFw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UQ-0004fz-Oa for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 13/58] gnu: bash: Avoid hang when cross-built for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497517484 (code B ref 74290); Sun, 24 Nov 2024 07:57:06 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:15 +0000 Received: from localhost ([127.0.0.1]:60685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Xu-C7 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TU-0004VP-Ag for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:08 -0500 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 1tF7TP-0001wF-0g; Sun, 24 Nov 2024 02:56:03 -0500 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=O2paMw05P4xg8gLY+nDmUoHYGnjWMhlOcVokJPZ7WCA=; b=nxOxjJSjoWZz9QrImWik hxv6Gfst1HhI2d5o4oIN/z5oY6RtYSCv2eA+jI7iAvmMBqlE7rZx6xgO+Yy7kaINgnZZlXYZXZjKy 6V7NYvVYRvASXKtv4CArQIV6znA/9q/p9HFP4PDGFs44Nb4fpNwdiD8i80uFfMzh94NBAhMd2ucZ5 Nhtgzx4i5yNnrjoeRG/37mj3dujBQ8PbccFb9ZPyHHKD+vv0PLVSANMLx/6E/6gQglPw1qL6YycKt FYwtdz03ogIEjrX4uvopcQlw9rwFKILVSyIUAipKthG1PxejB+k5nlR4untf74uFalQh4nZq0QTGg SBuke7eJAPutoA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:36 +0100 Message-ID: <7235d52720e15f740207edb5a02a7b3e0d907f53.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 For example, without this patch bash hangs while configuring diffutils. Reproducer: cat >x.awk < `bash' link. From patchwork Sun Nov 24 07:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33804 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 66D1F27BBEA; Sun, 24 Nov 2024 07:58:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 268F227BBE9 for ; Sun, 24 Nov 2024 07:58:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UX-0000Ez-49; Sun, 24 Nov 2024 02:57:13 -0500 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 1tF7US-0000Cb-Ji for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 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 1tF7US-0002Ku-BV for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=aTMs8xEw0CGYr9VygJbmVodVKiDj4X0opF942qlq6B7S2n00y4/CjGRfMvFMBjzphEa4lng9nJ43UfU59oa/INpuPk6Qm1MqfeW67MCcCeUXnfpmWmVQ/t33knwiUaquvaFOwXIlDc30tS5pBI5xxiyB06y1hYtZJ6D1z1yZWGo7deYdPYf0yWkMkFLuNcrkjfND1DOY1E3cqYVG//kKINcJbyvOatBLgX3QfZa6hZFBIW927aUTPypfbv68dk7JM16cUBZ6Ku+N0YBlWzsVETC/fluFAAE/UptlW5YZVWFE+4pJsKF4vjgIarUa2eTM2b1f5rweKf0HyTJW3dVOew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7US-0004gU-5r for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 14/58] gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497817528 (code B ref 74290); Sun, 24 Nov 2024 07:57:08 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:18 +0000 Received: from localhost ([127.0.0.1]:60695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Td-0004YU-Jg for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TV-0004Vg-6q for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:09 -0500 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 1tF7TQ-0001wm-0T; Sun, 24 Nov 2024 02:56:04 -0500 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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=J+uoFIPNvQaBXIErmGgZ hJqIXzFAHn6S/5XX6J843qVCY5CbrP49Q9yJlHNCBaHbTPyclMbR9GJrKd9Tytf9tbaRioLNO2iAL YT8X7P6kxI3nWc8K/DvR+0a3ukqZvG5THLeB1BpecToUUepTDYOfqe+xO/fZV3DY3uMHOGrm7dRwH ldzbH59M+3wf3l7UhteNRjQibyCtxYqSpWZ+3H2Se8pzmF9X/sHRLkRXiyMsqHnw2dxFTw6mhIKIi Phu4xPCEFSb0aRfpI2O4xEbTGqPZ7BC6Uip/m1jAEnNBclS0mQmYqSMlwuj/sWEcnJ5grAWF6nIK8 8dvGWiqzHHQk5Q==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:37 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/version-control.scm (git-minimal)[arguments]: When building for the 64bit Hurd, or cross-compiling, use "-Wno-implicit-function-declaration" in #:make-flags. Use target-hurd? instead of comparing with "i586-pc-gnu" in "use-host-uname_S" phase. Change-Id: Ib9836be8a1e389a82c8a89adf22aaeac0d85bd14 --- gnu/packages/version-control.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..ca77b485ad 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -296,7 +296,10 @@ (define-public git-minimal ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see . - "NO_INSTALL_HARDLINKS=indeed") + "NO_INSTALL_HARDLINKS=indeed" + #$@(if (or (target-hurd64?) (%current-target-system)) + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -305,7 +308,7 @@ (define-public git-minimal (lambda _ (substitute* "config.mak.uname" (("uname_S := .*" all) - (if (equal? #$(%current-target-system) "i586-pc-gnu") + (if #$(target-hurd?) "uname_S := GNU\n" all)))))) ;; We do not have a full bash when cross-compiling. From patchwork Sun Nov 24 07:54:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33799 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 3CA0C27BBEB; Sun, 24 Nov 2024 07:58:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 C4C8827BBE9 for ; Sun, 24 Nov 2024 07:58:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ue-0000Le-Ll; Sun, 24 Nov 2024 02:57:20 -0500 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 1tF7Uc-0000Hg-Jo for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7Ub-0002La-3W for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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=9l4KVSOnda24IMPFgajqnKj4x3vM9NTeG2XRYAyA4Hg=; b=MB8pd7xuZgr72alVTj4E7cIoFxByFjavVq8T4Yk9M9MRF0Uij7Qim5xCvBfHm1NFQXz+5mpPj7gSJAijf0Dzq3TbRRobyKg7rEdikzsnNJt/I3v9V5fsow7WmZIEwgHNVmlk7pLZzoYVva0MC46bGYLlrW5SwUvzCpfWraohj+9N73sIVGSqIdwFQVWyz5Xn9oTeDEyZVeybaahjDM6JExHEsqFyYz8+E1yLvfX3lL1dTTdaLRRM6ovDIxcr3cI4K2UjJNdv+/u0oCaYQlrU4s7EmKH36ww7fKe5sQQs0SdpHHI9DS6+2/VecsTjsxgUrtPWBuRm2NoP3BdA+khMWw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004jP-SF for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 15/58] gnu: flex: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502517951 (code B ref 74290); Sun, 24 Nov 2024 07:57:16 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:60803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fL-Kt for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TZ-0004WU-CT for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:13 -0500 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 1tF7TU-00022I-69; Sun, 24 Nov 2024 02:56:08 -0500 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=9l4KVSOnda24IMPFgajqnKj4x3vM9NTeG2XRYAyA4Hg=; b=frhJZb7s3+SJ991Bjki4 HRUjnvm3qskS+wVVGguLdDe37c8q0daUSoG5Bk+pCHM3uSRF8lQCIxMqMJ81gKzlzvVqu/b+jjcIG uy/Io+e70HE0FrGplr+jryIECY5FlgfY0AgqGp6P5Nn87jSvmyXTkAulzEVmYbi3iKVgOyYSQmfUx Phwn6SxajqrjeGK80weOQ2ZSenQJMPXK4kRzOXeui1xTmXeCOHgDPS276h6QjciiUEbvmAfY6vXTX a71QmOBUcghGTqyGD6DQXHxeJ+s313LDnx8UhZzjEc/bu5oEHxTxDEaXa4+bIbllG5zFRMgAgRY8A EvTWAAaRXqJvbg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:38 +0100 Message-ID: <465ee53122e00749ced0cfa940b789bfa2af4fca.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/flex.scm (flex): When building for the 64bit Hurd, or cross-compiling, add "-Wno-int-conversion "-Wno-implicit-function-declaration" to #:configure-flags. Change-Id: Ia0503e3f5c7aa5354a949b69035a1be6f93ec85f --- gnu/packages/flex.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 7972675971..4ad1e1382a 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages flex) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages m4) @@ -53,6 +55,12 @@ (define-public flex ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests)))) + (arguments + (if (or (target-hurd64?) (%current-target-system)) + (list #:configure-flags + #~'(#$(string-append "CFLAGS=-Wno-int-conversion" + " -Wno-implicit-function-declaration"))) + '())) ;; m4 is not present in PATH when cross-building (native-inputs (list help2man m4)) From patchwork Sun Nov 24 07:54:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33786 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 7DB4027BBE9; Sun, 24 Nov 2024 07:57:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 A6AB127BBEA for ; Sun, 24 Nov 2024 07:57:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ub-0000Fg-1w; Sun, 24 Nov 2024 02:57:17 -0500 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 1tF7UT-0000Df-9m for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 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 1tF7UT-0002Kz-0u for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 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=lqpisiRgmw43Cx2rzKtRJIYjy0xr1729dZT+hDGieYc=; b=BQ4NAoavUakVCuN1EOLHL+Nw/UpW4bfdWQq7HjqGLsOS6rdkrDXKx3NEhs5sllCSTBBCYIna3z8S/mIclcgox0/ph6xGfgMK8mm5zKVTsj7+mu7dhTRALOMNoZm/nUlnAGOo2XZ7aYNHDWS2p5fQjSpmyZoC+49hxpXrxIOyspMo86tmsryqjLUuNm2TXnm8D6Gbh/YF3P3RzYAEZOh3vTfXcgYOBCr29+1fxMxFsJ1G31wsuSPQDqVX6MvScYQ7hinhM+NBLTJFi3tv4x/sPX8lHDPlXWGeo41Dqv7RaQkXvof54h/DTVaJDq9/3k0li3OzbySvBMmZcOS770hTBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7US-0004gi-RL for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 16/58] gnu: libffi: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500417716 (code B ref 74290); Sun, 24 Nov 2024 07:57:08 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:44 +0000 Received: from localhost ([127.0.0.1]:60745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bZ-6n for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Wc-6B for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:15 -0500 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 1tF7TU-00022c-W8; Sun, 24 Nov 2024 02:56:09 -0500 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=lqpisiRgmw43Cx2rzKtRJIYjy0xr1729dZT+hDGieYc=; b=YMQoN3OPqUaVdXYjgMCT XgAFpRRxDXc+jeafKUVuObE98G/CdkPxYjfTm9bKQj+Re40Xp9xsYa48xEUr+jAK7laLi6V4M38e/ 4oY1/k0i/2Fhvy8nj6n5ysMQS1aoFjoMtr4EKHG7h1V4CcrZUJwKrCFj9UKRubJhMoq5nSskj8tSr VVs/rEgLX85tB/jUpZKPre4jVgl8Xhl1XE3Sa/3fPKkjmlQx/GZeYPJip8ZcLHMqJu2AWbj9ubh1S ImcG2i4ttlZQpkSIDAllkoOp3fjoQzfxpExRYvoQbAglm+slCu9doYwOFXexMhOmqZxtMXwjcxdJU lfXAzUdYte3R6Q==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:39 +0100 Message-ID: <59f0acb9eeb06db0050064945f58cc68320dbd92.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/libffi.scm (libffi)[arguments]: When building for the 64bit Hurd, or cross-building, add "CFLAGS" to #:configure-flags to disable breaking warning. Change-Id: I05bf3f460f3e292626de1894b7a3cf381cb07702 --- gnu/packages/libffi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index ba3fc6bc79..62be8f0c4a 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2020 John Doe +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,12 @@ (define-public libffi `(;; Prevent the build system from passing -march and -mtune to the ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". #:configure-flags '("--enable-portable-binary" - "--without-gcc-arch"))) + "--without-gcc-arch" + ,@(if (or (target-hurd64?) (%current-target-system)) + (list (string-append + "CFLAGS=-g -O2" + " -Wno-implicit-function-declaration")) + '())))) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description From patchwork Sun Nov 24 07:54:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33794 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 4A6EC27BBEA; Sun, 24 Nov 2024 07:57:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 F164127BBE2 for ; Sun, 24 Nov 2024 07:57:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uc-0000HL-Fb; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UU-0000EZ-4N for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 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 1tF7UT-0002L7-Ry for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 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=UIwR6zWpgjQu9Ditvecz9ZJh7DyV0oKKw+QUwHm+1Vs=; b=HNpm/lJcJymeUY52GlTmx0+G5m91BVojxDr13fIwVbCaW0EtSPrpDeTyqZSrA4UrHplPR1Yduk7sv9uuYafL62zyn+da1zbjPz/kWkjt00XAueagRcStG+t9QSQwPGTCHEyYltsNds6Frtj/gS7RcVrhogP/CvR6D4zO/K16DczvMAF0qtTmeJ4k7XwDcJ6AJ8D+TOMzHngctoTjhcWmqa4YCAsbrhIV7IV8YsAvToM2PilGqDlHxlSx6iLH9hrIw9r4t5I7Glei0J3cQM9J8ovLNALY2bFzbV62Lwsrqh1PQNNvs7opyjPe6VGLYCLP6t4t3q/x98KEV9JlOc0BaQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UT-0004gx-M3 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 17/58] gnu: perl: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500517723 (code B ref 74290); Sun, 24 Nov 2024 07:57:09 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:45 +0000 Received: from localhost ([127.0.0.1]:60747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bh-LV for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tb-0004Wo-6v for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:15 -0500 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 1tF7TV-00022l-W4; Sun, 24 Nov 2024 02:56:10 -0500 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=UIwR6zWpgjQu9Ditvecz9ZJh7DyV0oKKw+QUwHm+1Vs=; b=LZKxVsGeEa3xnCBBp9KE b2haTVV4L0UourfbkXHbqgeJ8uQnj2WIMpa3Lz8FhhUgbSHJgm2nl4SdENyrGa+RvmGfB5XG8mBl+ twbw4DWqpdtEpxTHzZd1i9UatRrEcNMOFUE8pAfYRrTfZsGQIMv7TrIDBaWzEUYkqdbUs3L4TBgnK NTGnuUwe3UR0C45XHT3h2OxryBgjmD32MYcL56/rGDI+R8/hA2y+4H1GOj3KuWSa8XvrxxTRTfvhZ IdiHtiKl/YBPpai8nauHBAZH+hDbsRPahZ9QqnG0l5LQg2Fc+YDH3KEvkDWSvvz+OqpI0q8nNFGpk d1V4Y7hsOWRBOg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:40 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/cross-base.scm (perl)[native-inputs]: Update perl-cross to 1.6. Change-Id: I4a77f51a6757ad4aed9bcca8f9bbbf2cbd162e15 --- gnu/packages/perl.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index faaac13bf1..3941ad4831 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -248,14 +248,16 @@ (define-public perl (native-inputs (if (%current-target-system) `(("perl-cross" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/arsv/perl-cross") - (commit "1.4"))) - (file-name (git-file-name "perl-cross" "1.4")) - (sha256 - (base32 "1ydjvlhrk06ccyj4bm8by7xk90krsll2k380mc3x1mhfrc7r9gzy"))))) + ,(let ((version "1.6")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arsv/perl-cross") + (commit version))) + (file-name (git-file-name "perl-cross" version)) + (sha256 + (base32 + "0s06lkx5b79r9cn6pm5p6d4jbdjq7wg7rjr75nw5xdhw1z3wnl2d")))))) '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") From patchwork Sun Nov 24 07:54:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33797 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 994B227BBEA; Sun, 24 Nov 2024 07:58:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 1DE6D27BBE2 for ; Sun, 24 Nov 2024 07:58:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uc-0000IQ-Sh; Sun, 24 Nov 2024 02:57:19 -0500 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 1tF7UU-0000Ea-Ip for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 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 1tF7UU-0002LD-AP for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 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=4B7O21e4Ya9ExhiXsAGVMXRIEvNrT7qik/64Z91abLc=; b=Cjh+sJ1UlTwYc7vg02lWvvTnZqvSy4xOkXE3kHo8tycwWcegU2zdIrbf75N6MZ0pW4L1f2XV3UStFjKrOJ/dZUx0cfMFqIELviHSMNMVx3i/Bhl7+g11uD+JDFoeBk6YnKJLgylsmJ4MdWmK0XjPhKUiZ5uzimahcW7FYMZKSr4XA4oMtS+6/c4G4DPYOVUPRkdCO8/TPyV6GMWmFP8V7TMYbVUWBvNck9edN1fZoABk8eWG7tjNAVwEccN1xjZJrBMBPsqjaERw67fNDmb+BSLWUr9DrOv60D33ujnDtWQj+XOHH/KahxydWkdQADIWdJfB8qxXIFxv5NfHr3gIKg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UU-0004h5-4l for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 18/58] gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500517737 (code B ref 74290); Sun, 24 Nov 2024 07:57:10 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:45 +0000 Received: from localhost ([127.0.0.1]:60751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U5-0004bq-0n for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tc-0004X0-0p for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:16 -0500 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 1tF7TW-00023G-QM; Sun, 24 Nov 2024 02:56:10 -0500 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=4B7O21e4Ya9ExhiXsAGVMXRIEvNrT7qik/64Z91abLc=; b=JeE0k6wDad6BajQKTvpa RqOV2Rc2rtx/AxtgBq59PN9R/nkaaro5kDzH3RUemzkgxrLOBJkUiRB9uGYFDaEAoVpNPPfzwl267 vwad6AnjZToxXdN7gy0dQd/i3At1iYSOYz3VycAjmw6V9NlpjcG4zOgihbvPQcxmp/dPS0zknjlI/ JDQu8GArfEQjYGpNWNuipv3MJN38POjqJzv4oWWe4d6r72ieSiEctb+MWuf1vjnZIzP0aQWqz0SOU zTXbLGK1bh71LGY6RuGHGv5+HMFnWCet7Wu4wJlv87GYlWCe5JW/mUk8hx3aM++8NqwSYvK9RThwX 61OV98/5tJWLrg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:41 +0100 Message-ID: <0df7f97acfd57a4c72d50058213c2af0a05ea8f8.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/texinfo.scm (texinfo-4): When building for the 64bit Hurd, or cross-compiling, add "-Wno-incompatible-pointer-types" to #:configure-flags. Change-Id: Ia0503e3f5c7aa5354a949b69035a1be6f93ec85f --- gnu/packages/texinfo.scm | 50 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 98429cb059..13c780897e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 ( ;;; @@ -169,31 +169,35 @@ (define-public texinfo-4 (modify-inputs (package-native-inputs texinfo) (prepend automake))) (arguments - (substitute-keyword-arguments (package-arguments texinfo) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'fix-configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.sub and config.guess. - (with-directory-excursion "build-aux" - (for-each - (lambda (file) - (install-file (string-append - (assoc-ref - (or native-inputs inputs) "automake") - "/share/automake-" - ,(version-major+minor - (package-version automake)) - "/" file) ".")) - '("config.sub" "config.guess"))) - #t)) - ;; Build native version of tools before running 'build phase. - ,@(if (%current-target-system) - `((add-before 'build 'make-native-gnu-lib + (append + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib (lambda* (#:key inputs #:allow-other-keys) (invoke "make" "-C" "tools/gnulib/lib") #t))) - '()))))))) + '())))) + (if (or (target-hurd64?) (%current-target-system)) + (list #:configure-flags ''("CFLAGS=-Wno-incompatible-pointer-types")) + '()))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without From patchwork Sun Nov 24 07:54:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33791 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 9FF7827BBE2; Sun, 24 Nov 2024 07:57:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 6A41527BBE2 for ; Sun, 24 Nov 2024 07:57:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ub-0000Fe-1J; Sun, 24 Nov 2024 02:57:17 -0500 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 1tF7UV-0000Ek-6F for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 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 1tF7UU-0002LJ-U3 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 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=GYJYDWvcaLLc+ShZiUmXRy2h4jwaJDQffy5hjWiHZEI=; b=GjVrs5DTfde39cR2g5iwOTfIQrPWDQ2ieXXvIcsH4vKUcDv14KBn97j5CiyxKlzi7C/qmZ+HJ2kB9fYU6ioQA2PzzkGWjx223gZBrVgqnBWAALt5CyzuXiIYqvy57OD2sgjoMDwuhoETww+KhHq5xahRyTvLGo/mh4Vwow3A+4Wp4w8gcfOcg7CMCZ4w2QIh1prp0W0Rl1OfpJjK89HzpAIMD6ZL0YrG9THg6sQIwrnr7c1VQpoTAvNaRXD7h7krAzIZA7sGaRJHz0NXAoAp7Mf8iyCqVz6EArHmFMk2LigQ/ZAEeIQdgEZFpozCCDjMdrGYQdpqkKX9CKVUhWJcpA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UU-0004hJ-OY for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 19/58] gnu: hurd: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500617744 (code B ref 74290); Sun, 24 Nov 2024 07:57:10 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:46 +0000 Received: from localhost ([127.0.0.1]:60753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U5-0004c2-O4 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Td-0004XP-3w for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:17 -0500 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 1tF7TX-00023m-TV; Sun, 24 Nov 2024 02:56:11 -0500 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=GYJYDWvcaLLc+ShZiUmXRy2h4jwaJDQffy5hjWiHZEI=; b=TAvOJaqSViE9H2+44MLV dLfxCQkUIGrzFrwK3t7/aRM/jpmqFB3CHGUCm3qlB2XO9YAd4ZPaQqZ9pxdvIrMBIKy18iiDrIgfX /UmMWTBOGY+onDyegbsJBQKgjwlCjea7MeJpb/VCs2uOgrlyklHLP4t3jfO+qrJbj3AqEkf6NRo8O MzwmZsJz31rHKfsRqs8ORkCfUs9Fzjg8bsCtBjrp2UdJTOyHgfsIAkZRq7ChXQNZx47OfzfY89JfI 32AzcDq0ooMK0ABMRyzjEPt8MA5xrdp8OWGLmpFn2lLspu5IKEEGitqjTEJvUUplI8wYrZHuIYpWu tIAqXcISNkE6JA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:42 +0100 Message-ID: <3abc1600e1c1610e5b9e64edcbe83ddf805b7dcd.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/hurd.scm (hurd)[arguments]: In phase "build-libdde-linux", disable some warnings breaking the build, using "WARNINGS=...". Change-Id: Ib70926a90e1d37080c5b9dd333f19636cdae3013 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 06fae1bd3b..5a60d8ac13 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -478,6 +478,12 @@ (define-public hurd "/bin/bash") (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86"))) (add-after 'install 'install-goodies (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) From patchwork Sun Nov 24 07:54:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33805 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 269D727BBF3; Sun, 24 Nov 2024 07:58:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 D6AD027BBE9 for ; Sun, 24 Nov 2024 07:58:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000P1-3O; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Uc-0000Ha-IB for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UV-0002LR-Md for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 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=xEF0ll7dUIqVcV6ikDQ7f4MB3hi/jMUESKOS+d4IpDk=; b=g8va/mgzxg4ND7H66aiFM+NhbFe23AZWzJTOvloogbr+jTUNH7TwA6mvEgwyBWtAP048yGYxarRzy5cZVkG13UMNelH3haCFYZgrbgUUiQ5L99iLL+J/YX0MPEYHYB0NcPfasOL6NSUeFEhGZUAQDhdHeRgtrkGr7RBf1EMVXg+OLja2FSqeMr44MHhhJnj05G4TZM6cd83uZc4Vdo/LvJMBB2HB4s875Ini63oWcjY7zaSnqFBxr18R/XbXHeCK8L/B2jyg8s/ag7kFu1skmSUD3KCupWoJ69oksL2UVsb+UYTmaZ9Cn+QSkIC1r/Mx5Hv9WeJejQ/HYWGoGf37xA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UV-0004hY-GK for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 20/58] gnu: netdde: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500617758 (code B ref 74290); Sun, 24 Nov 2024 07:57:11 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:46 +0000 Received: from localhost ([127.0.0.1]:60755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004c9-3I for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Te-0004XZ-5D for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:18 -0500 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 1tF7TY-000250-VR; Sun, 24 Nov 2024 02:56:12 -0500 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=xEF0ll7dUIqVcV6ikDQ7f4MB3hi/jMUESKOS+d4IpDk=; b=YoSgglIuWphngw3rBEoc bsJthnALkn9W8AhNKRuwqk8wwBUUwR+x7GCnO+XLT1sYmx8Wh3LiKVR3v9+0aEjjLudoAp5pTwe9q YKO1Z2sHqgSDhEegm0hs6fr45zsxAxAzkjfKIdI2RZU7wpN8GjwgYagjFJJM8Qzrgfx+/SlHEUaBj pG7srhsUMpz7vTftAJ5gzOvyzhYIv1eu9knE9Isd0+sQ1AuubajZFP4o6kC5G12xjfFoqLXGsJMnp W+aAIlx3IZySkQusDtDZoUBIK/pE+mImZbPFQR1OAhM7Dn/y06UqiZutwYYuCr4Pn976VCz637ce3 NpnQVrpnNLvbBw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:43 +0100 Message-ID: <6728e032b55db76586c30bbeeb87f59c71e0def0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/hurd.scm (netdde)[arguments]: Disable some warnings breaking the build, using "WARNINGS=..." in #:make-flags. Change-Id: I39f577c51eaa3d86abf80a54f7c172324cf56749 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5a60d8ac13..5fdb6359d1 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -592,6 +592,12 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86") #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) From patchwork Sun Nov 24 07:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33820 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 1646027BBEA; Sun, 24 Nov 2024 07:59:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 C2CE127BBE2 for ; Sun, 24 Nov 2024 07:59:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7W0-0001jM-BD; Sun, 24 Nov 2024 02:58:44 -0500 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 1tF7Uc-0000Ht-Lf for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UW-0002LS-HM for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 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=iZ7gvj8TZhmo++vO5wvgaIjArhnfvdAxNWoJeaXJfSU=; b=OF/SgGpvTNFbKx8DqhfdQfzycF3JopOav0o9tNn8V7TdeETn+n5toJkQ9h0+pVjLka5qLC9ouVvqNT+1/Tl2hzIcIGyw5w950wTXCVZLBnmv0u5X5mRlenZWrHudQKYRBS8TgrNPaHyvhKshOOC5y2Nx27pvAefH8dySXLTdRo2uxyddCoLPL0ayZa4P5xcP6XTHwmE8HcF4DQW9KsmJi4rb5vn57e7ZSnKRIs2BuMs1yHqeZgxz+wEl2O1P4DtfIg0H6DfE61bkg6W8J0x5m8pxmuLSoV+pXTrc9ET8DFiE4rXAxw5H4ErOimeFCdK5PSzfhKvNFae//lZFKllfxA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UW-0004hp-BS for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 21/58] gnu: libedit: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500717766 (code B ref 74290); Sun, 24 Nov 2024 07:57:12 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:47 +0000 Received: from localhost ([127.0.0.1]:60759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004cN-HB for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tf-0004Xo-7n for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:20 -0500 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 1tF7Ta-00025Q-12; Sun, 24 Nov 2024 02:56:14 -0500 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=iZ7gvj8TZhmo++vO5wvgaIjArhnfvdAxNWoJeaXJfSU=; b=B8FXbAfUq4z1yM9UDITM DuMfY3NtnKaQObM5jkYw6xJG5sofichjDOn3UydXtTtHpMIKZJtDgX+IIVP//QxN7umVum5FaPOOZ 8mzWw0+0guPQ5q4dEJNgP8tZwDwrkhKnjZq0aWp027Owp903zCFrWk/WhpvR+4yIcIljBj0/f9HMs fxklHb9cuK6z6kaFlQswxSFZe20QaIO/2KrL9hff8P0V5gr37WgAfeCSqYHSR9rnFzH4BXMWwtrj9 680lPkqWriQ5s5cawK+3702dvLgsxKrXsPEiZBCdk+NphLLa58VaMvJX8WnNyc40B9LR5kTBuSb35 pqLiln5Hv90NTw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:44 +0100 Message-ID: <8a26c747401226b6e942ab890fe2e605b6bd8680.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/libedit.scm (libedit)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/libedit.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index f04d3aafe4..252f8a4966 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,8 +22,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libedit) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages ncurses)) @@ -39,6 +42,11 @@ (define-public libedit (sha256 (base32 "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v")))) (build-system gnu-build-system) + (arguments + (if (and (%current-target-system) (target-x86-32?)) + (list #:configure-flags + #~(list "CFLAGS=-g -O2 -Wno-incompatible-pointer-types")) + '())) (inputs (list ncurses)) (home-page "https://thrysoee.dk/editline/") From patchwork Sun Nov 24 07:54:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33806 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 73D7827BBF3; Sun, 24 Nov 2024 07:58:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 E20F327BBEA for ; Sun, 24 Nov 2024 07:58:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ue-0000LB-Da; Sun, 24 Nov 2024 02:57:20 -0500 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 1tF7Uc-0000Hn-Ks for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UX-0002LT-AU for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=EUkjdRjYzk/3O5yJpgH95NPVI0Ms5+Ldj88Q1U8yleB9HpHfYzckOZMIzZPjHEtPX4lLquDprtOJf1Wrv6qmRb3UVm8tpd5+WLOZH+3mvaTr/IPYFinllTQWmtnQbNN0kU+c+P8sqgqj8f2nQVk/GkNjUB7lI/capu6LZXwbLYWLbmNwMt6C2tucKf8J406JWpEryAuUdXAplXB2VgPJssXewWHKaoIHSqGhHf5Src6mJGlY0An3qgXbL5HXxZgX0SQptWZZ7atWSFPzhrOqxFEeokngLxRBTrUf+f+bfD6SDwW5ND3qar51nVOWjCxu/2FEfYMwBZv4VmEtII6pSg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004i3-4E for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 22/58] gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500717774 (code B ref 74290); Sun, 24 Nov 2024 07:57:13 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:47 +0000 Received: from localhost ([127.0.0.1]:60761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cV-56 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tg-0004Y4-6A for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:21 -0500 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 1tF7Ta-000279-SH; Sun, 24 Nov 2024 02:56:14 -0500 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=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=NZfELuWkamhIxOk3wu98 vdOvdSdPDX1u5+pLBOE805s6NBAy9vN752UReEgP3KOq27w3+ffgamOhdh/e29AIXRavqu4W/DpU4 DJYc8I5Dq8oNg4SiYeIjIflV0N8PFiXGIHiE8UkCCWliznxO4IEH8DAfWHZNG6lR9ijbwD85031O3 SxyCGmWkJ+/gdsqjNjRRqOcll79gdLHs7zz4WTnyh6GNp4Ikj2YS/IPLmJbUFxvskvYl5+gT6P6e6 05XI3u8QIoPOkERi69PV7iLnOJ901D2M2//PeUy0u6AKVfKwHl7khfjWne+tjvmQ9Xzy/JaWLothP chw1qxCACpRSUg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:45 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/ssh.scm (libssh)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/ssh.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a29a10e954..1f33259246 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire @@ -156,7 +156,12 @@ (define-public libssh (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - '(#:configure-flags '("-DWITH_GCRYPT=ON") + `(#:configure-flags '("-DWITH_GCRYPT=ON" + ,@(if (and (%current-target-system) (target-x86-32?)) + (list (string-append + "-DCMAKE_C_FLAGS=-g -O2" + " -Wno-incompatible-pointer-types")) + '())) ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) From patchwork Sun Nov 24 07:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33793 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 B5D2A27BBEA; Sun, 24 Nov 2024 07:57:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 23C4827BBE2 for ; Sun, 24 Nov 2024 07:57:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000Oy-3P; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Uc-0000Hp-Kv for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UZ-0002LW-DZ; Sun, 24 Nov 2024 02:57:18 -0500 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=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=axAYRAKB7IcaQlDthNjiTGKFPPjHVJA+im5KXCBQMgpvo9dT24m3Gs0a4ok3dCWcvx0/SLNf/kWp8Cw3dZF7+T60d5hbkNY1CnVTGbVmP6fGKPqmHbmwNSAYfO4SUwHSD/e6agkASyQVKHK6dmfb248QGiJd9U+1F+q/hpR4/pgdgayWQOvlxvm3QAppqfUrxGpsxJgrsY96yyd9OhGcFx9LdHDdHPZuoqqlJE8bsjcP9jhwBQfR6CaD+u6XeZCViZAyT0JXwiDM0qT5RNAWsiO+hchK07hVedUfrhaQj8YYuKCAyBdSmAasv2/7pyJ1pbBxm7/IYdQb768XiGa9aw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UZ-0004in-7e; Sun, 24 Nov 2024 02:57:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 23/58] gnu: guile-lzlib: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500917803 (code B ref 74290); Sun, 24 Nov 2024 07:57:15 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:49 +0000 Received: from localhost ([127.0.0.1]:60767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004cs-9h for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tg-0004YH-VQ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:23 -0500 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 1tF7Tb-000283-Oh; Sun, 24 Nov 2024 02:56:15 -0500 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=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=T1YQoHn52nMu98k0VZJg Rwjy/8y59QasbBcreSnX/sZ76lx+JcPcMg5UiqbbPcBwYjj7/34IPGymmeIySaXi5Gg1GvgEY56XP 2SHrsUVqrcW4BhiV5P7Bz+QX/AINHPtEQJ0AmOljDkwdYC+2ALo3RfRHgztjTHYzke4xFtyLNFe7V feOT3xHvlyitveuyG4mz+nREeSFQqSDrLF0emobd9oYxBwa12rwmP0x3c/20uCmGDRHI3hx9n+Nsz WP7FPdWrj8B4nycKS+AW5hu/HNEdis2dGEWuCeSfDkOKJUfSAAgCbdp5qfUCxow320lsXBsK6D0TO /7GIXyHk18PhGA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/patches/guile-lzlib-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/guile.scm (guile-lzlib)[arguments]: Use G-expressions. When building for the 64bit Hurd, or cross-compiling, use it in new "apply-hurd64-patch" stage. Change-Id: Id03f71baa80e2f4f967f54037ce7d9f1c5dc4bb6 --- gnu/local.mk | 1 + gnu/packages/guile.scm | 16 ++++++++-- gnu/packages/patches/guile-lzlib-hurd64.patch | 32 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index f15272f25c..3df0d4effa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ + %D%/packages/patches/guile-lzlib-hurd64.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-ssh-rename-bool.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8dabbb2c5e..69dff9211f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christine Lemmer-Webber -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo @@ -962,8 +962,18 @@ (define-public guile-lzlib "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (list + #:make-flags #~'("GUILE_AUTO_COMPILE=0") ;prevent guild warnings + #:phases (if (or (%current-target-system) (target-hurd64?)) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "guile-lzlib-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (native-inputs (list autoconf automake pkg-config guile-3.0)) (inputs (list guile-3.0 lzlib)) (synopsis "Guile bindings to lzlib") diff --git a/gnu/packages/patches/guile-lzlib-hurd64.patch b/gnu/packages/patches/guile-lzlib-hurd64.patch new file mode 100644 index 0000000000..12e8c3617d --- /dev/null +++ b/gnu/packages/patches/guile-lzlib-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Presented upstream. + +From 80dcd31562827f4b6d085affe9d9f22164f7ed34 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 15 Nov 2024 16:18:29 +0100 +Subject: [PATCH] build: Support the 64bit Hurd. + +* configure.ac: When cross-compiling declare LZ_decompress_open before +using it in conftest.c. +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50dc5ac..4c56768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,10 @@ AC_DEFUN([GUILE_LIBLZ_FILE_NAME], [ + [if test "$cross_compiling" = yes; then + # When cross-compiling, we cannot rely on 'ldd'. Instead, look + # the output of 'ld --verbose', assuming we're using GNU ld. +- echo 'int main () { return LZ_decompress_open(); }' > conftest.c ++ cat > conftest.c < X-Patchwork-Id: 33807 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 C617027BBEA; Sun, 24 Nov 2024 07:58:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 0D91F27BBED for ; Sun, 24 Nov 2024 07:58:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VG-0000im-VH; Sun, 24 Nov 2024 02:57:59 -0500 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 1tF7Uc-0000Hr-LE for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UY-0002LU-0o; Sun, 24 Nov 2024 02:57:18 -0500 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=Y7bvj7bLCTrW/89zMFH39GYUzblPVrQRZUmycBA/1Do=; b=c99fShZ4wj3JReH1tGvrLl9NEcrHR4xqvtm0TrUGnNrRwnAyiqO3Z+I2Sf6rAj2oJ0ofgWfoCVZAx1BbBfLtSycdIOj9YhBSbyYrJl3ZEUI3uEQ3hmJt4xFeGDwweDfvLGYUeLCXqXuEwlku5c+itY2B+r/4vArhoRFBtgmhui/HVBRhFk2kh/bks+1boq4atigonwGYZKWU1NLQ6DZBzsbSFD97oa1hBnqINoD0LvH9QwKztNp5Z5FAabGrRyyGo3ArZlONdF970wWyz4f0+hZ4ZG42ygZRaO9swYzScQQUIgVZ1UycZmKhxml7GiKzzt85qJQsHWIlA/b0VlL+rg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004iO-RD; Sun, 24 Nov 2024 02:57:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 24/58] gnu: cross-base: Update %xgcc to gcc-14, to support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500817782 (code B ref 74290); Sun, 24 Nov 2024 07:57:13 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:48 +0000 Received: from localhost ([127.0.0.1]:60763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cc-Hg for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Th-0004YK-Q8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:22 -0500 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 1tF7Tc-00028E-Jl; Sun, 24 Nov 2024 02:56:16 -0500 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=Y7bvj7bLCTrW/89zMFH39GYUzblPVrQRZUmycBA/1Do=; b=UzCaIM6Be/rosVHsM3zX O9CcM6yo4+sV63zQDj3ijfiNtQzmc5iikGFsS7argNWwhrwtCGTyIJeI1rOggE5DAqFLIBmtXX3Bp zpTDwibY1CD6GWPdlIcCAz/5hymSwztXwNle5CyprBg4v792r37RRGsZNGOv8y6r2PeHSKyBkG4b/ GCRwWIXsrn7X/UNokQH+X3ykVSodz5OxxM3xyVc8TVgu8gd1CK/o9LUcYQMTHaGEfLGNvEeZtL0a8 95AYSgezB8MvJCFDQK3jPO9h2Q6rS7rJDB1gi3yEHiIVVDZobtbmaUd3q7SrhSPrtBakMb52WAVIc l3B450XxWJeb3w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:47 +0100 Message-ID: <48c6f9f4ee43695e8d7fddf846c98a866dfc8def.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 Gcc-14 adds support for the 64bit Hurd. * gnu/packages/cross-base.scm (%xgcc): Bump to gcc-14. Change-Id: Idf7696c50532aa4def2b2d37cdb5c70715125123 --- gnu/packages/cross-base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 4961b3b4c0..ad3616eaba 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 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2019, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Marius Bakke @@ -61,7 +61,7 @@ (define-syntax %xgcc ;; ;; Note: This is a macro so that we do not refer to 'gcc' from the top ;; level, which would lead to circular-dependency issues. - (identifier-syntax gcc)) + (identifier-syntax gcc-14)) (define %gcc-include-paths ;; Environment variables for header search paths. From patchwork Sun Nov 24 07:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33803 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 DC0D927BBEA; Sun, 24 Nov 2024 07:58:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 AC6EE27BBE2 for ; Sun, 24 Nov 2024 07:58:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ug-0000NE-CL; Sun, 24 Nov 2024 02:57:22 -0500 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 1tF7Uc-0000Hs-M3 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7UY-0002LV-R0; Sun, 24 Nov 2024 02:57:18 -0500 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=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=; b=U2Xkwa8nXQ1/VhIoUuBCPtoCaR0sPXKkXwqPC6lrc1GSjlLkyrWaLP3PnOsSSAZndsh6iMk3h3F9ExJwD6n3cXGFcB0RmChj8ZnoM38XqlsJvGeKxxXDSOwyLCeUwvMLgWiPn1+gne4WHnzeXlT8+tIwjp4O8WSAlfFY9Vh3yJ8MshzEtMW1zv4vm6qvmI9nl4oYHN898cSakSzskAkF0hfr8DTz+CZvEbqr8drfo7d8NJYvlG+MbHGToUFFO4YbEhINC7/+nCAKlZ4KVrWaHF/yrMhMLjKrbQ1g9f8lzUuYXhUyoNtVDGkt9vLjLa6akv1S6G1DzyJfeCL8MPJ/fA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UY-0004iY-IU; Sun, 24 Nov 2024 02:57:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 25/58] gnu: gcc-14: Force libdir /lib instead of /lib64 for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500817789 (code B ref 74290); Sun, 24 Nov 2024 07:57:14 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:48 +0000 Received: from localhost ([127.0.0.1]:60765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cl-US for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ti-0004Yd-Mv for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:22 -0500 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 1tF7Td-00028N-GI; Sun, 24 Nov 2024 02:56:17 -0500 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=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=; b=caNlTXm7tST3cvu++t1t YdfYVAozU+nSqfFepcZML/Kfev9R2S2lEPudLu0nHGKTyIXjlue4q7NKPhEO7YCWS7ThPQWna6Lq+ oI9oUgtNjPO+dT3TDiMDH01OftqKgbhl75KKwEKqWPZ0Ogc7GuF0wr7K52OVlpQfqUsytHCJsAGtl j1DjqNx5ko3HSWBSa3D8hj78dO/eHPCJCgpqlkAHgNr19Q7+sJGIPpp/4ZiTmy5I2Y0SZLcBli9nG rOsKuVoZCiw84JFuCbToj544+BM4fwpnl8heqRR1iqQRfvxsCuNEK1i/okBuFd9ncYyTROhKnVQZC CfYrQQP8j2knLA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:48 +0100 Message-ID: <07b8a9d99607011e815e015d92aa161aebe4b722.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/gcc.scm (gcc-14)[arguments]: In stage "pre-x86-configure", also patch "gcc/config/i386/t-gnu64". Change-Id: Ib2607c5f315c49696596fdcbcbbcc2895b6a9775 --- gnu/packages/gcc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 64ba37fd69..e437bf5826 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -843,7 +843,8 @@ (define-public gcc-14 #~(modify-phases #$phases (add-before 'configure 'pre-x86-configure (lambda _ - (substitute* "gcc/config/i386/t-linux64" + (substitute* '("gcc/config/i386/t-linux64" + "gcc/config/i386/t-gnu64") (("\\.\\./lib64") "../lib")))))))) (properties `((compiler-cpu-architectures From patchwork Sun Nov 24 07:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33801 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 11B6027BBEA; Sun, 24 Nov 2024 07:58:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8453427BBE2 for ; Sun, 24 Nov 2024 07:58:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000Pm-UJ; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Uc-0000Hq-L3 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7Ua-0002LZ-8D; Sun, 24 Nov 2024 02:57:18 -0500 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=BVm5Zb7pzY+EdGpPmReBiK5VXpxD069JAF12x72F+ig=; b=dTZwxe85kyRd1Nvqm05T6YbQoVLPdtgeyvFK+WMTqswZwFLjgmJjkqK/PwLywdsAsBTmSYP9AZJ0/TSoFanB0XqtunmGZRTkZQ2Xzjrc3ie9lfR1T8YlxeruHZySL5nbyKvVtcbQfcLmyoKLAA1CzH/na/buTAd/B8UuD5Ki66wVNjnRex3xWZoc+fkLilx5jYKiuE1drjxTeRUd9v13G6mkO+wGkBIJvfWb+VqCqdw3Tk9WO66pzo8PPPpgPUnNNs423j3KW0+s7pzPb9o9yFDMRgAGg+bgMDFWSFSMZcgxnEK0rmDVA+YcJLRUMPShoai25v+CbTFaqlMXT6gy5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004j3-2Y; Sun, 24 Nov 2024 02:57:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 26/58] gnu: glibc/hurd: Add patch for the 64bit Hurd, fixing "raise". Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500917810 (code B ref 74290); Sun, 24 Nov 2024 07:57:15 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:49 +0000 Received: from localhost ([127.0.0.1]:60771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U9-0004d6-34 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tj-0004Yn-GM for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:24 -0500 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 1tF7Te-00029q-9X; Sun, 24 Nov 2024 02:56:18 -0500 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=BVm5Zb7pzY+EdGpPmReBiK5VXpxD069JAF12x72F+ig=; b=WsHGP4aBzY0E2WGmcXen cz7D8TDwUab8vzf7jtmk0196dRxKJ40bQJHvHB0QH4Fs/RbJf/ruV9mbbwft6XcYTYt0GjJ9EpyUP mfhQKpO9XhdVKcbWUHYciUQErGsCjAlq+SHE49mWcG28L7UojUu68AB3GbCVeATwXcImpPXfreYAG 9S0oRkyhalEEP4hlmMM1XqZhmkxfRSyrhfyyqeCclXZ0T4BxHEh8x2eLFuDOPXwllcVp3iXd9JQEb XxlchX42hqaCg2i4v9SSUF3w+DMk+1P4RNFwrRY+62eDOqDvJk1qrEBUBCRlhNq/JYCwJEmlSLf/G thUBg/OrPTs99w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:49 +0100 Message-ID: X-Mailer: git-send-email 2.46.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 This fixes findutil's gnulib-tests's test-sigaction's raise call, by working around an alleged gcc-14.2 optimization bug. See . * gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (glibc/hurd): Use it. Change-Id: I11e683f521f34dedeb7f739a2545f5d1d866922a --- gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- .../glibc-hurd64-gcc-14.2-tls-bug.patch | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3df0d4effa..6164ee45c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,6 +1439,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch \ %D%/packages/patches/glibc-hurd64-fault.patch \ %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ %D%/packages/patches/glibc-hurd64-sgms-context.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 80e53c2e52..cbce8bd634 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1598,7 +1598,8 @@ (define-public glibc/hurd (search-patches "glibc-hurd-pthread_setcancelstate.patch" "glibc-hurd64-fault.patch" "glibc-hurd64-intr-msg-clobber.patch" - "glibc-hurd64-sgms-context.patch"))))))) + "glibc-hurd64-sgms-context.patch" + "glibc-hurd64-gcc-14.2-tls-bug.patch"))))))) (define-public glibc/hurd-headers (package/inherit glibc/hurd diff --git a/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch b/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch new file mode 100644 index 0000000000..5823a230fd --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch @@ -0,0 +1,28 @@ +From 0b23ab98d25d880ee602af91e62aa39564510cac Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 22 Nov 2024 16:26:08 +0100 +Subject: [PATCH] x86_64-hurd: sigreturn: Hack around gcc-14.2 optimization + bug. + +See: . + +* sysdeps/mach/hurd/x86_64/sigreturn.c (__sigreturn2): Add nop. +--- + sysdeps/mach/hurd/x86_64/sigreturn.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sysdeps/mach/hurd/x86_64/sigreturn.c b/sysdeps/mach/hurd/x86_64/sigreturn.c +index 7a0193497d..256cc1268a 100644 +--- a/sysdeps/mach/hurd/x86_64/sigreturn.c ++++ b/sysdeps/mach/hurd/x86_64/sigreturn.c +@@ -45,6 +45,7 @@ __sigreturn2 (struct hurd_sigstate *ss, uintptr_t *usp, + (void) __mach_port_mod_refs (__mach_task_self (), reply_port, + MACH_PORT_RIGHT_RECEIVE, -1); + THREAD_SETMEM (THREAD_SELF, reply_port, sc_reply_port); ++ asm ("nop"); // See . + + asm volatile ( + /* Point the stack to the register dump. */ +-- +2.46.0 + From patchwork Sun Nov 24 07:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33796 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 3FCFB27BBEA; Sun, 24 Nov 2024 07:58:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 B043D27BBE2 for ; Sun, 24 Nov 2024 07:58:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uh-0000Ot-PQ; Sun, 24 Nov 2024 02:57:23 -0500 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 1tF7Uc-0000Ho-LF for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 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 1tF7Ub-0002Lb-MS; Sun, 24 Nov 2024 02:57:18 -0500 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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=WcIBdBp4yGkSxTh97oIdyQa++crjGjsJ4GSvN5WVerVBvMgLHL+IL65Y9qVaikZwskU8CnEdHuhs9//0w0jZX0bQExsNnXDBw01/gCSTg6wiWjF7of83gOcNwCNPObQ9g/B9zoHnnFrPdFO6yHMS5OSAMcdhFYJxUv5p1SV/qnDAKneFVYHMZETu2zX7FBtULFy0Zqe3GOnIAXOlYXcuttVlkN1dCDuPGPE5xsb4fIL4Xl8tL2VwnqyXoEHOrqtbwTX7EAlXHCy8E0mYfdf6usm6RtzyVj/6IZRtLnmNHWcmEooWNil1zlumYBoXjBy2QvPmPnJRcf6HWWg/c2Cirw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jX-Fh; Sun, 24 Nov 2024 02:57:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 27/58] gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502517961 (code B ref 74290); Sun, 24 Nov 2024 07:57:17 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:60807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fU-3K for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tk-0004Yt-Fr for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:24 -0500 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 1tF7Tf-0002BU-6l; Sun, 24 Nov 2024 02:56:19 -0500 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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=MBZG11nn1YLCzs5N+4FT ieGo6Rulk1dYKKIiUdkk5Rnor99wBYjPTr9dHH+6DZz3BIR8W5hPjBA59LF6+uptOeXG66pBTWyu0 exn63zSMYLzIwt1l0h7UUFDzy05e3CMqj84SlbhDdzYaldNcLmkGXEycu4qAqP+TZ5afl3xPIk23g kIP5DZKpHgzoamZkcOo24w2FxgfwzpcoIMbgvyohHq9sKBCJBSVlbeI+yXWB5Hl/hCkteimvWzhl8 wPpNBUtReYzlg/iinqYXFwGO/Nk2kilVI9gpZ9hdEt9cVksPTp4iWWJkR5m/k+Y5m4q94p500jgZI 6KBrD8vQJ1BRtQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:50 +0100 Message-ID: <417cc042f45d6107ca5014cf099e2cb5a3869051.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/make-bootstrap.scm (%gcc-static): Use gcc-14. Update to use G-Expressions. [inputs]: Remove libstdc++ and libstdc++-headers. (%gcc-stripped): Use gcc-14. [inputs, native-inputs]: Clear fields. Change-Id: I4e6d779cb457b256d80d1882f182b72a6f7d2be2 --- gnu/packages/make-bootstrap.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 689d48d342..e0dcca7b33 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -488,11 +488,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit gcc-14) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments gcc-14) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -501,7 +501,7 @@ (define %gcc-static ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) - `(append (list + #~(append (list ;; We don't need a full bootstrap here. "--disable-bootstrap" @@ -526,9 +526,9 @@ (define %gcc-static "--disable-libssp" "--disable-libquadmath") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'pre-configure 'remove-lgcc_s (lambda _ ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in @@ -538,12 +538,12 @@ (define %gcc-static (substitute* (cons "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}")) - #t)))))) + ((" -lgcc_s}}") "}}")))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(fold alist-delete (package-inputs gcc-14) + '("libstdc++" "libstdc++-headers")))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -556,17 +556,19 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs gcc-14)) + (package-native-inputs gcc-14)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit gcc-14) (name "gcc-stripped") (build-system trivial-build-system) (source #f) (outputs '("out")) ;only one output + (inputs '()) + (native-inputs '()) (arguments (list #:modules '((guix build utils)) #:builder @@ -632,6 +634,7 @@ (define* (make-guile-static guile patches) (propagated-inputs (modify-inputs (package-propagated-inputs guile) (replace "libgc" libgc/static-libs))) + (arguments (substitute-keyword-arguments (package-arguments guile) ((#:configure-flags flags #~'()) From patchwork Sun Nov 24 07:54:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33813 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 8C6FF27BBEC; Sun, 24 Nov 2024 07:58:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 B3F2B27BBE2 for ; Sun, 24 Nov 2024 07:58:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ug-0000Nm-Eh; Sun, 24 Nov 2024 02:57:22 -0500 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 1tF7Ue-0000Ko-1y for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 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 1tF7Ud-0002NV-Np; Sun, 24 Nov 2024 02:57:19 -0500 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=pJOnriogFqUmWVWBEECU2E1NMVtAsSCsZ4+v81K9wj0=; b=ApnRBWieSaasg6NQNkN7vBQj1IYUHQxfb5LTWmB4qOQ65qagwnx3Ph7GkjKnwluaSdGehj/UP02iJxvuOy+P5GT+XRRYdgEkxfuGNuVz9vKiyzBOhLjDyj+FMQ/HJTw73aKpwH5PhUgN3WWyRzzr2kagSnC7JJRTEGe6wcjd7+NljjjD7N2BtsYegNi+0wkZJ/GVyXFheho8nk/AGFsZwBtla2L1aMeLLI8dHEvJYqDk/Eolu1etzwPNL0SIkYsWwirCyCG61HYwncFHS2lxDiawhXsdwHatiTHzYslEoVrj/EKib60W1ITtj1ktM6naHmJhhfmSS3iNybxESIPI4A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uc-0004jt-5J; Sun, 24 Nov 2024 02:57:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 28/58] DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502717989 (code B ref 74290); Sun, 24 Nov 2024 07:57:18 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:07 +0000 Received: from localhost ([127.0.0.1]:60809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fn-Ps for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tl-0004Z0-Jh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:26 -0500 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 1tF7Tg-0002Bd-6E; Sun, 24 Nov 2024 02:56:20 -0500 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=pJOnriogFqUmWVWBEECU2E1NMVtAsSCsZ4+v81K9wj0=; b=fBY/zVBRE9dpS6a03Mqc bnqcC01M9xoqWttVTRA26PBRGftnZqRi3/Xo+NfPfEUyIwIzh3xGvLsBDyJoFAwAOSNwuqEIubQyj 2/wEiJfBMThPGdk25rIim7Qp3n7Su4cpApXq4WNtoUH6AYZF8YyI/a6fxaZtn/ggrU6XdhBQbVppA OBGVhmHgtcuvUsc7jmJy1uIXewsp6tCe08xfzztzDracSD98egPO6BLJ6zeCvhIlZLYQPF4HFzQBW AjCskgSftLSOk/8AMmVVe3WC+gm02ZrFj9oGi0NI4bH5UIOgPq/8RM0Elz0HbKUH2X4if3QwVgd9f tvpwNU1gQldQFw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:51 +0100 Message-ID: <767111b9284fbd2980452205459f446cbc75a5cc.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 XXX TODO: v Boot a 64bit hurd, and v Guix shell --bootstrap -D -e '(@@ (gnu packages commencement) gnu-make-boot0)' v Guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' o Guix build hello, o Guix shell --bootstrap -D guix, o Push the commit below, o Re-check the bootstrap-tarballs build/hash, o Update this commit message with new commit hash, o Push it with remainder of hurd-team branch, o Write hurd64 blog post! On commit: cdf94aaceabe243a128e404585f4795391b12eb5 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 --- doc/guix.texi | 9 ++++++++- gnu/packages/bootstrap.scm | 36 +++++++++++++++++++++++++++++++++++- guix/packages.scm | 8 +++++--- m4/guix.m4 | 12 +++++++++--- 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5953fcfa26..08665ff4e0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* -Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan Nieuwenhuizen@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@* @@ -639,6 +639,13 @@ GNU Distribution (@pxref{transparent-emulation-qemu, @code{hurd-vm-service-type}}). @xref{Contributing}, on how to help! +@item x86_64-gnu +@uref{https://hurd.gnu.org, GNU/Hurd} on the @code{x86_64} Intel/AMD +64-bit architecture. + +This configuration is even more experimental and under heavy upstream +development. + @item mips64el-linux (unsupported) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 27798fe278..8027918323 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -125,6 +125,15 @@ (define %bootstrap-executables ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) ("xz" ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) + ("x86_64-gnu" + ("bash" + ,(base32 "1xvhwyvamlcva01zv6pz7br7d2lgq5qd14misi8wffxc78c4lndk")) + ("mkdir" + ,(base32 "1c5irkgxaxpwlxzf68xg47j7m6ibd9xqvxznlml42nhfnrka447s")) + ("tar" + ,(base32 "0ak7sri6294y1g3ia1yrf7facxc7dij02mlxi4xg6k5yszv1jd3w")) + ("xz" + ,(base32 "0zz9pgw0pyadqsq9nvvpiryk1gpmm89754m6xlqh4ssbbvzpk3y6"))) ("mips64el-linux" ("bash" ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) @@ -165,6 +174,7 @@ (define (bootstrap-executable-file-name system program) (match system ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) + ("x86_64-gnu" (string-append system "/20241122/" program)) ("powerpc-linux" (string-append system "/20200923/bin/" program)) ("riscv64-linux" (string-append system "/20210725/bin/" program)) (_ (string-append system "/" program @@ -366,6 +376,8 @@ (define (bootstrap-guile-url-path system) "/20150101/guile-2.0.11.tar.xz") ("i586-gnu" "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241122/guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz") ("powerpc64le-linux" "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") ("riscv64-linux" @@ -387,9 +399,11 @@ (define (bootstrap-guile-hash system) ("powerpc64le-linux" (base32 "1rnyfz5q38jyvxddj617443bnnzql4vw0mxzqpj8wz48wx4bhbq0")) ("aarch64-linux" - (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) + (base32 "1ymp3lck1l5fybsa542ny2fdkfydfcfvqbgr3qh03yvq4fwfn6mc")) ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) + ("x86_64-gnu" + (base32 "109p34v8fgxznxdyb90y74qj6ppwgb5qj0c2pa3gxba7x1r0p4k1")) ("powerpc-linux" (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) ("riscv64-linux" @@ -599,6 +613,8 @@ (define %bootstrap-coreutils&co "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241122/static-binaries-0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.tar.xz") ("riscv64-linux" @@ -626,6 +642,9 @@ (define %bootstrap-coreutils&co ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) + ("x86_64-gnu" + (base32 + "04zksa2457h1vcl5ry2hyzhhsg8fckvfdgadp0viba3anwms2463")) ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) @@ -682,6 +701,8 @@ (define %bootstrap-binutils "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241122/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.tar.xz") ("riscv64-linux" @@ -712,6 +733,9 @@ (define %bootstrap-binutils ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) + ("x86_64-gnu" + (base32 + "1fasv76rppnqlshjqc7dbzngic9cqswi5ydzg6w9rc075daqk8kb")) ("powerpc-linux" (base32 "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")) @@ -772,6 +796,8 @@ (define %bootstrap-glibc "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241122/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") ("riscv64-linux" @@ -802,6 +828,9 @@ (define %bootstrap-glibc ("i586-gnu" (base32 "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")) + ("x86_64-gnu" + (base32 + "1w4h91kxl64a62l646966i73zp2cj6w4dmyc64fh0c1hhdykxass")) ("powerpc-linux" (base32 "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) @@ -878,6 +907,8 @@ (define %bootstrap-gcc "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241122/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") ("riscv64-linux" @@ -908,6 +939,9 @@ (define %bootstrap-gcc ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) + ("x86_64-gnu" + (base32 + "1cgbhc76hlccx6v2z7kk7z173lryyq3la5mmbwivl6hbl1zcqg3m")) ("powerpc-linux" (base32 "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")) diff --git a/guix/packages.scm b/guix/packages.scm index f373136d22..403217d711 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -419,7 +420,7 @@ (define %32bit-supported-systems (define %64bit-supported-systems ;; This is the list of 64-bit system types that are supported. '("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" - "riscv64-linux")) + "riscv64-linux" "x86_64-gnu")) (define %supported-systems ;; This is the list of system types that are supported. By default, we @@ -428,14 +429,15 @@ (define %supported-systems (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. - '("i586-gnu")) + '("i586-gnu" "x86_64-gnu")) (define %cuirass-supported-systems ;; This is the list of system types for which build machines are available. ;; ;; XXX: MIPS is unavailable in CI: ;; . - (fold delete %supported-systems '("mips64el-linux" "powerpc-linux" "riscv64-linux"))) + (fold delete %supported-systems '("mips64el-linux" "powerpc-linux" + "riscv64-linux" "x86_64-gnu"))) (define (maybe-add-input-labels inputs) "Add labels to INPUTS unless it already has them." diff --git a/m4/guix.m4 b/m4/guix.m4 index b93daba5c3..8c2757a8b7 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -3,6 +3,7 @@ dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Co dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017, 2020, 2021, 2023 Efraim Flashner dnl Copyright © 2021 Chris Marusich +dnl Copyright © 2024 Janneke Nieuwenhuizen dnl dnl This file is part of GNU Guix. dnl @@ -61,8 +62,13 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [ linux-musl*) guix_system="$machine_name-linux";; gnu*) - # Always use i586 for GNU/Hurd. - guix_system="i586-gnu";; + case "$machine_name" in + i386|i486|i586|i686) + # Always use i586 for 32bit GNU/Hurd. + guix_system="i586-gnu";; + *) + guix_system="$machine_name-gnu";; + esac;; *) # Strip the version number from names such as `gnu0.3', # `darwin10.2.0', etc. @@ -91,7 +97,7 @@ courageous and port the GNU System distribution to it (see # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in - x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|riscv64-linux|i586-gnu) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|riscv64-linux|i586-gnu|x86_64-gnu) ;; mips64el-linux|powerpc-linux) AC_MSG_WARN([building Guix on `$guix_system', which is not supported]) From patchwork Sun Nov 24 07:54:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33800 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 BA66027BBE9; Sun, 24 Nov 2024 07:58:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 2E1C927BBE2 for ; Sun, 24 Nov 2024 07:58:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VG-0000ht-TB; Sun, 24 Nov 2024 02:57:58 -0500 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 1tF7Ud-0000Jz-Gu for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 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 1tF7Ud-0002NM-7P for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 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=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; b=ht8AMD0CxLk/ZH3fbCersEF3t+sX/yc78WyPpIv8WOJLe4cG31oWQJRQfRyLlk+xNwGjBqosgHUB1CcsJwHhfLJKkT18yIt8p9+fWHDlAfgqEvLL/Y6nIl30W1c935JaBeotNb11A6OcmRBUXPUxmrxUszTM5KMOm9ac1O3WBQSwpIVVKRFkGwis9aRcP9PTQwCmopENZQWQ4nGy3zU3O951vRJ628yiM5Mcg7sZjrMjrQUVWpu1lm60EuljuQ4kb9bqi9a82YSMujKDwstlim+rtTBbIxeoT1tlUhYdcxShrabRxpXzfFfGWqk3xpqeeNnCRAx4AZfzix69/gWkMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kB-19 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 29/58] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502718006 (code B ref 74290); Sun, 24 Nov 2024 07:57:18 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:07 +0000 Received: from localhost ([127.0.0.1]:60815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UQ-0004g6-VN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tm-0004Z8-Uh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:27 -0500 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 1tF7Th-0002CI-Nr; Sun, 24 Nov 2024 02:56:21 -0500 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=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; b=Z3A9xmpvRhg6gQI27hO+ KAFmL2pOuxsp5ltvT5Sf3IL1i7RFwd5Kg9oYzLq3Qhs+u9+2I4oopygVi2J6clDnvRJZ2yEmj+54z XX3kAzAGMYL6pZpipFsjErY/IncVrvjST5W4u43vmKvDHvAvxeJkxx+Uy33YqKxC5mCWIYa3gx3o+ r+aIHZcSWp/4ZhSWqdEptwE1r/vIKHEGEqy0juPOkZkjw7YlqcFpGNstnWtSCZ00F65/8aedFWEI2 bEQnhFaCLytGtnPySp7wbe2/7EO3B3Any0MJRmxElPG8tndNXSreUgdFXRl6Se6pRBgxQhb1Bf+rk N1R+XrCOePxWkQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:52 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/system/hurd.scm (%hurd64-default-operating-system-kernel, %hurd64-default-operating-system): New variables. * gnu/system/images/hurd.scm (hurd64-disk-image, hurd64-image-type, hurd64-qcow2-image-type, hurd64-barebones-disk-image, hurd64-barebones-qcow2-image): New variables. * gnu/system/images/hurd.scm (hurd64-barebones-os): New variable. --- gnu/system/hurd.scm | 17 +++++++++ gnu/system/images/hurd.scm | 72 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9a351529e8..6263d3de71 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -18,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu system hurd) + #:use-module (ice-9 match) #:use-module (guix gexp) #:use-module (guix profiles) #:use-module (guix utils) @@ -51,6 +52,8 @@ (define-module (gnu system hurd) %desktop-services/hurd %hurd-default-operating-system %hurd-default-operating-system-kernel + %hurd64-default-operating-system + %hurd64-default-operating-system-kernel %setuid-programs/hurd)) ;;; Commentary: @@ -68,6 +71,14 @@ (define %hurd-default-operating-system-kernel (%current-target-system #f)) gnumach))) +(define %hurd64-default-operating-system-kernel + (if (system-hurd?) + gnumach + ;; A cross-built GNUmach does not work + (with-parameters ((%current-system "x86_64-linux") + (%current-target-system #f)) + gnumach))) + (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to ;; shepherd the herd, but also because we want its 'halt' and 'reboot' @@ -142,3 +153,9 @@ (define %hurd-default-operating-system (essential-services (hurd-default-essential-services this-operating-system)) (privileged-programs '()) (setuid-programs %setuid-programs/hurd))) + +(define %hurd64-default-operating-system + (operating-system + (inherit %hurd-default-operating-system) + (kernel %hurd64-default-operating-system-kernel))) + diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 01c422a54f..67815aeb9b 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Mathieu Othacehe -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +36,14 @@ (define-module (gnu system images hurd) hurd-image-type hurd-qcow2-image-type hurd-barebones-disk-image - hurd-barebones-qcow2-image)) + hurd-barebones-qcow2-image + + hurd64-barebones-os + hurd64-disk-image + hurd6-image-type + hurd64-qcow2-image-type + hurd64-barebones-disk-image + hurd64-barebones-qcow2-image)) (define hurd-barebones-os (operating-system @@ -62,6 +69,30 @@ (define hurd-barebones-os (password-authentication? #t))) %base-services+qemu-networking/hurd)))) +(define hurd64-barebones-os + (operating-system + (inherit %hurd64-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu") + (timezone "Europe/Amsterdam") + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + %base-services+qemu-networking/hurd)))) + (define hurd-initialize-root-partition #~(lambda* (#:rest args) (apply initialize-root-partition @@ -115,5 +146,42 @@ (define hurd-barebones-qcow2-image #:type hurd-qcow2-image-type)) (name 'hurd-barebones.qcow2))) + +;;; +;;; 64bit Hurd +;;; +(define hurd64-disk-image + (image + (inherit hurd-disk-image) + (platform x86_64-gnu))) + +(define hurd64-image-type + (image-type + (name 'hurd64-raw) + (constructor (cut image-with-os hurd64-disk-image <>)))) + +(define hurd64-qcow2-image-type + (image-type + (name 'hurd64-qcow2) + (constructor (lambda (os) + (image + (inherit hurd64-disk-image) + (format 'compressed-qcow2) + (operating-system os)))))) + +(define hurd64-barebones-disk-image + (image + (inherit + (os+platform->image hurd64-barebones-os x86_64-gnu + #:type hurd64-image-type)) + (name 'hurd64-barebones-disk-image))) + +(define hurd64-barebones-qcow2-image + (image + (inherit + (os+platform->image hurd64-barebones-os x86_64-gnu + #:type hurd64-qcow2-image-type)) + (name 'hurd64-barebones.qcow2))) + ;; Return the default image. hurd-barebones-qcow2-image From patchwork Sun Nov 24 07:54:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33814 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 4CD8A27BBEA; Sun, 24 Nov 2024 07:58:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8A2D327BBE2 for ; Sun, 24 Nov 2024 07:58:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000Pj-JQ; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Ue-0000LC-Df for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 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 1tF7Ue-0002Nu-4A for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 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=CeIObxsqShvSjynZmD7Je9VEBGX3z5DA81ADCJXWCKg=; b=iT3IujLlu1WN53fa3chgJdVme/OI5/RxrATg/f9X76+nznyMLRjeR9/JmQ0uaFxAbhjW3sFEB//hjgic63s/eZzai4s4LTns2JdMazOvZwFKDrNea/cORIMNyRhD3Lhj6UveAhQZHMAhtEo66pelBbnnPWxwiuGsTa5VVsNAh09TkPlfzKyCsY5hLfBNpmt/Liqr5UFKS8mFy9CVX0MDNwAShCRr6bjRWOKocXNuOi6hZ23QvMp+CtGDrNLIHXCRc0xI3RCQE31hVJqI0owHWmi9HC9JRGdaZG+zAp1mWe47int7EMoX8xMExJ/L4p1CfuQgjfPWTIbOjUFGEJ6NJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kZ-U2 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 30/58] gnu: libgpg-error: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502818021 (code B ref 74290); Sun, 24 Nov 2024 07:57:19 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:08 +0000 Received: from localhost ([127.0.0.1]:60817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UR-0004gI-LX for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tn-0004ZE-Sh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:29 -0500 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 1tF7Ti-0002CQ-MG; Sun, 24 Nov 2024 02:56:22 -0500 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=CeIObxsqShvSjynZmD7Je9VEBGX3z5DA81ADCJXWCKg=; b=opZx3pnwwN+denBBs5qz 2GNx96XuOq5jGb4yr4t5ihfgdBqIWnX+yGoYomBwpXsN0f/bzosdteimbC9GEXZWmpo7spL7pigc2 bi6TNVSc2hjag0YCnZYGqfQPOQ8UQ4RVWfbq56VRQbgtEYujeYpOuw0InDNeca9xesPQ25zLpZv4i 3x7D7NGLKJUSbi5A6NJeeyBP/LlgZz+HPavqutcUEAJaKSDUVxdflqZMvFvwuKsblDDzCwZ3xgqvz Dt97QUEs4vp7ABwSaT+c3aExkJ/o6k6b9uUSGWW5LOW+aLhD0iXEQ5f2ef19NW9pdZBisl4U5kbq1 t0Omh6AKDUK5ug==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:53 +0100 Message-ID: <8f4776c2f9dd03aa65b234b54b91c8edcdebf16e.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/libgpg-error-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Use it when building for the 64bit Hurd. Change-Id: Icabb7cd7bb5bcc771ccee5b8a7f57f52b9b58183 --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 22 +++++- .../patches/libgpg-error-hurd64.patch | 78 +++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6164ee45c7..52239fb0e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ + %D%/packages/patches/libgpg-error-hurd64.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..6535f94cb8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022, 2023 Maxim Cournoyer -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -144,9 +144,25 @@ (define-public libgpg-error ;; configuration, as this is not correct for ;; all architectures. (_ #t))) - (#t #t))))))) + (#t #t))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()))) ((system-hurd?) - #~((add-after 'unpack 'skip-tests + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))) + (add-after 'unpack 'skip-tests (lambda _ (substitute* "tests/t-syserror.c" (("(^| )main *\\(.*" all) diff --git a/gnu/packages/patches/libgpg-error-hurd64.patch b/gnu/packages/patches/libgpg-error-hurd64.patch new file mode 100644 index 0000000000..aac8ce61f1 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-hurd64.patch @@ -0,0 +1,78 @@ +Upstream-status: Taken from upstream (1.48 series). + +From c62157c615a6379677c8f106bf9413d2611fd95e Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sat, 6 May 2023 16:10:55 +0200 +Subject: [PATCH] core: Add hurd-amd64 support + +-- +This supports the x86_64-pc-gnu triplet + +Signed-off-by: Samuel Thibault +--- + src/Makefile.am | 1 + + src/mkheader.c | 2 ++ + src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h | 24 ++++++++++++++++++++ + 3 files changed, 27 insertions(+) + create mode 100644 src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index c61adde..9389e99 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -67,6 +67,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-apple-darwin.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ +diff --git a/src/mkheader.c b/src/mkheader.c +index 8fbfbd6..cc0eaa3 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -108,6 +108,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack, char **r_os) + {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, + {"x86_64-pc-linux-gnu" }, + ++ {"x86_64-pc-gnu"}, ++ + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + + {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, +diff --git a/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +new file mode 100644 +index 0000000..7c7e6f1 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +@@ -0,0 +1,24 @@ ++## lock-obj-pub.x86_64-pc-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[32]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## + +base-commit: 7a42ff0ec971f4f2add28b0edad6cf381b5b8acc +-- +2.46.0 + From patchwork Sun Nov 24 07:54:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33818 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 DB4D427BBE9; Sun, 24 Nov 2024 07:58:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 6D1FB27BBEB for ; Sun, 24 Nov 2024 07:58:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ug-0000Np-FK; Sun, 24 Nov 2024 02:57:22 -0500 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 1tF7Uf-0000MM-5j for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 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 1tF7Ue-0002OI-SU for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 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=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=j1R8rcw2RVkuh/BLbS8fmVkqGXq3bTfkIY9ifbkiLJqmNZj0yXZDA1/K9D9CoQonnNjasKXBiGKtTNRdZfpYN6T0rwkK69MT0Mou1koxH14mrH+ZlgU0Pgzv3WjVgmNHVVj55pBcJnWv01+PIjRuttCGbK6OlXOjkn5Ek8AhvOUj/wQwAKbVytIogpFjMlcOhmhnNZw9ZY6ZhXv4sDHztYCyPaZiu0t6ff++WjMAQs/YG8Yh/JBSG92mwxRiOw+Rfat3bMMfl5RPOhuCbvA6uPWCgeoi0+9ZiAFOCoPi5Qs11IOexmMdy2o5/0CYqdmLyX3llzydNkjvfD5Tmukegw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004kq-NT for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 31/58] gnu: openssl-3.0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502918036 (code B ref 74290); Sun, 24 Nov 2024 07:57:20 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:09 +0000 Received: from localhost ([127.0.0.1]:60822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7US-0004gc-KK for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7To-0004ZN-PH for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:29 -0500 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 1tF7Tj-0002Ca-HB; Sun, 24 Nov 2024 02:56:23 -0500 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=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=YP9chkuKg21N965vMPFo U0KuLp+ZR1+p1CDldd5gKfk1KC+CIpylXgzemjxUBjpcT4V4VfZ40Ez5eFV49cTRcTJoUEg2SI7cd IiAJCmWfPSVNVfLClR/3XOBpdHfUgOobOWfEprlLzXiDigpHm43Mvq44E/R/4oAWLNx4Sd3XX54ZG ZNkXCsTA5N3X/pkA/xWOSjGenvFQssSuaLFHciWjE6a7xfK5Dqu93ZEne4LE+S1dw8llWrAih4yjk FI+e3emi4kSD5cbVmw7CNiF1NIQhA3CjQgoMzkRshM4Fl+peRWNo2DrAw0I0GdrS7QS3GY5JELmxc RNGxb4aQaBRtJQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:54 +0100 Message-ID: <663e3d1a6a8465ad8aa4a78c79b532a77f558abf.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/openssl-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/tls.scm (openssl-3.0)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + gnu/packages/patches/openssl-hurd64.patch | 99 +++++++++++++++++++++++ gnu/packages/tls.scm | 9 +++ 3 files changed, 109 insertions(+) create mode 100644 gnu/packages/patches/openssl-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 52239fb0e0..c1eca1f940 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1899,6 +1899,7 @@ dist_patch_DATA = \ %D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \ + %D%/packages/patches/openssl-hurd64.patch \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \ diff --git a/gnu/packages/patches/openssl-hurd64.patch b/gnu/packages/patches/openssl-hurd64.patch new file mode 100644 index 0000000000..372fda834a --- /dev/null +++ b/gnu/packages/patches/openssl-hurd64.patch @@ -0,0 +1,99 @@ +Upstream-status: Taken from upstream: + +. + +From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Thu, 7 Nov 2024 14:08:05 +0100 +Subject: [PATCH] Add support for the 64bit Hurd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Taken from . +--- + Configurations/10-main.conf | 45 ++++++++++++++++++++++++++++++++----- + util/perl/OpenSSL/config.pm | 3 ++- + 2 files changed, 41 insertions(+), 7 deletions(-) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index b578a3c2a8..740460ebd3 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -1685,20 +1685,53 @@ my %targets = ( + }, + + ##### GNU Hurd +- "hurd-x86" => { ++ "hurd-generic32" => { + inherit_from => [ "BASE_unix" ], + CC => "gcc", +- CFLAGS => "-O3 -fomit-frame-pointer -Wall", ++ CXX => "g++", ++ CFLAGS => picker(default => "-Wall", ++ debug => "-O0 -g", ++ release => "-O3"), ++ CXXFLAGS => picker(default => "-Wall", ++ debug => "-O0 -g", ++ release => "-O3"), + cflags => threads("-pthread"), +- lib_cppflags => "-DL_ENDIAN", ++ cxxflags => combine("-std=c++11", threads("-pthread")), + ex_libs => add("-ldl", threads("-pthread")), +- bn_ops => "BN_LLONG", +- asm_arch => 'x86', +- perlasm_scheme => 'elf', ++ bn_ops => "BN_LLONG RC4_CHAR", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", ++ shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, ++ }, ++ ++ "hurd-generic64" => { ++ inherit_from => [ "hurd-generic32" ], ++ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", ++ }, ++ ++ #### X86 / X86_64 targets ++ "hurd-x86" => { ++ inherit_from => [ "hurd-generic32" ], ++ CFLAGS => add(picker(release => "-fomit-frame-pointer")), ++ cflags => add("-m32"), ++ cxxflags => add("-m32"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ bn_ops => "BN_LLONG", ++ asm_arch => 'x86', ++ perlasm_scheme => 'elf', ++ }, ++ ++ "hurd-x86_64" => { ++ inherit_from => [ "hurd-generic64" ], ++ cflags => add("-m64"), ++ cxxflags => add("-m64"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ bn_ops => "SIXTY_FOUR_BIT_LONG", ++ asm_arch => 'x86_64', ++ perlasm_scheme => 'elf', ++ multilib => "64", + }, + + ##### VxWorks for various targets +diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm +index 2f1edcafb6..707db71537 100755 +--- a/util/perl/OpenSSL/config.pm ++++ b/util/perl/OpenSSL/config.pm +@@ -92,7 +92,8 @@ my $guess_patterns = [ + [ 'IRIX64:.*', 'mips4-sgi-irix64' ], + [ 'Linux:[2-9]\..*', '${MACHINE}-whatever-linux2' ], + [ 'Linux:1\..*', '${MACHINE}-whatever-linux1' ], +- [ 'GNU.*', 'hurd-x86' ], ++ [ 'GNU:.*86-AT386', 'hurd-x86' ], ++ [ 'GNU:.*86_64-AT386', 'hurd-x86_64' ], + [ 'LynxOS:.*', '${MACHINE}-lynx-lynxos' ], + # BSD/OS always says 386 + [ 'BSD\/OS:4\..*', 'i486-whatever-bsdi4' ], +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 43806e24da..fab88518ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -589,6 +589,15 @@ (define-public openssl-3.0 "/bin/perl")))) #$@(if (target-hurd?) #~((delete 'patch-configure)) + #~()) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "openssl-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file))))) #~()))) ((#:configure-flags flags #~'()) (if (system-hurd?) From patchwork Sun Nov 24 07:54:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33809 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 5FA1927BBE2; Sun, 24 Nov 2024 07:58:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 0E8F027BBEE for ; Sun, 24 Nov 2024 07:58:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000Pk-Tf; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Uf-0000Ng-Vz for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:22 -0500 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 1tF7Uf-0002OV-Lh for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 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=CtDxwkfCK0lMk/yLSdXxzULvI6ltbSWECqTDdS9lKHM=; b=KynxZLGutsftHkSO71mbAW8VOCqf8sgdC0D/BFEyQiftF49HjeCiweAABo/ApucUvlHVq+EaBDrk8gpsnmaUCJfugtaJBT0UaEZ0gMZYOiJ2RTECGTWtwtqdsKO1Zj8+S23nhWrLXjgorXqT8ymvw1Yd0NMfvHGxb8QvTGWwc7LJGKBdfImU1t2PpvPBxkjbB1Waf7qIGhn2/QTgJTfBMF0b1v1bZUCC6joBFu8pjOKPpaVlzYUj8VwyCG1YoAGO99SvP5nVItuyk/a4By5I8TzEBAejobsAw9eYs0FdZMTo/KRjfkMZJ4nrTB+heyVoZU/zoqqOEHfrvNQ9cx4OQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uf-0004l6-Fy for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 32/58] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503018057 (code B ref 74290); Sun, 24 Nov 2024 07:57:21 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:10 +0000 Received: from localhost ([127.0.0.1]:60825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UT-0004gr-Dh for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tp-0004ZZ-Rq for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:30 -0500 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 1tF7Tk-0002Cj-DT; Sun, 24 Nov 2024 02:56:24 -0500 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=CtDxwkfCK0lMk/yLSdXxzULvI6ltbSWECqTDdS9lKHM=; b=IvSbZJh7v1PdcDIcuegU wQJkTjPKePhUEzepCzx2yquCiWJMDcjvFbV2MZg0LQrK78K2pJ5zogeRar3Px9aWDayy7u40upTjt tX4my1nppztub7K4Qb3yKGTJMrM3EV4HTwGps2NcBvE8+O7wA7KVFIIeTBiqmmA6gXJhse3+j7rFj Q9tLXe5cCDaiMIADcDFn4fhJv33V38++qZ39a+TyNGUGu7BTN52q8cuCR9HRFZUhc1r7kSAK/wCZr g3+oHprQOUQLp2NENj1tLB0El0FbrRA7RJ3RWkZ7JmRjapTu18a95nPeq/01AJRJX2EeD6Z8fagAc NNkeEZ5j1ItSGg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:55 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/patches/pciutils-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/pciutils.scm (pciutils)[arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + gnu/packages/patches/pciutils-hurd64.patch | 31 ++++++++++++++++++++++ gnu/packages/pciutils.scm | 25 +++++++++++------ 3 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pciutils-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1eca1f940..ceddce8f78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1914,6 +1914,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ + %D%/packages/patches/pciutils-hurd64.patch \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ diff --git a/gnu/packages/patches/pciutils-hurd64.patch b/gnu/packages/patches/pciutils-hurd64.patch new file mode 100644 index 0000000000..316f12e131 --- /dev/null +++ b/gnu/packages/patches/pciutils-hurd64.patch @@ -0,0 +1,31 @@ +Upstream-status: Not presented upstream. + +--- pciutils-3.8.0/lib/hurd.c.orig 2024-11-07 15:09:20.728973822 +0100 ++++ pciutils-3.8.0/lib/hurd.c 2024-11-07 15:05:08.524682813 +0100 +@@ -213,7 +213,7 @@ + hurd_read(struct pci_dev *d, int pos, byte * buf, int len) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + mach_port_t device_port = device_port_lookup(d); + +@@ -266,7 +266,7 @@ + mach_port_t device_port = device_port_lookup(d); + struct pci_bar regions[6]; + char *buf = (char *) ®ions; +- size_t size = sizeof(regions); ++ mach_msg_type_number_t size = sizeof(regions); + + int err = pci_get_dev_regions(device_port, &buf, &size); + if (err) +@@ -305,7 +305,7 @@ + struct pci_xrom_bar rom; + mach_port_t device_port = device_port_lookup(d); + char *buf = (char *) &rom; +- size_t size = sizeof(rom); ++ mach_msg_type_number_t size = sizeof(rom); + + int err = pci_get_dev_rom(device_port, &buf, &size); + if (err) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d2a352eb6b..08f1634113 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Marius Bakke ;;; @@ -81,25 +81,34 @@ (define-public pciutils "01aglgw9ds9qiswcbi2lx90lswncikrlyv8mmp4haix8542bvvci")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'unbundle-pci.ids (lambda* (#:key native-inputs inputs #:allow-other-keys) (copy-file (search-input-file (or native-inputs inputs) "share/hwdata/pci.ids") "pci.ids"))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "pciutils-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" - ,@(if (%current-target-system) - `((("^CROSS_COMPILE=.*$") + #$@(if (%current-target-system) + #~((("^CROSS_COMPILE=.*$") (string-append "CROSS_COMPILE=" - ,(%current-target-system) "-" + #$(%current-target-system) "-" "\n")) (("^HOST=.*$") (string-append "HOST=" - ,(gnu-triplet->nix-system + #$(gnu-triplet->nix-system (%current-target-system)) "\n")) ;; Disable 'install' strip option, that would fail when ;; we are cross-compiling. @@ -139,7 +148,7 @@ (define-public pciutils (invoke "make" "install" "install-lib")))) ;; Make sure programs have an RPATH so they can find libpciutils.so. - #:make-flags (list ,(string-append "CC=" + #:make-flags #~(list #$(string-append "CC=" (if (%current-target-system) (cc-for-target) "gcc")) From patchwork Sun Nov 24 07:54:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33810 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 320EB27BBE2; Sun, 24 Nov 2024 07:58:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 174DC27BBF0 for ; Sun, 24 Nov 2024 07:58:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uv-0000Sc-Ao; Sun, 24 Nov 2024 02:57:40 -0500 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 1tF7Ug-0000OK-W5 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500 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 1tF7Ug-0002Oc-Mi for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:22 -0500 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=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=; b=g28OT7esJ1j8srn5Q4fm197Izs01jfAw2smvSSjO2cz6av7Gldm/N9mNMzcAm8ZAr21rDfezNaMgEunEsp652n3txvFwDSZmTh+b4BERiukU+p28ztOlCHrzOAkQ35J/nwsQBaVSwZgd++vRS7BXCgwnFZQDKkOt9jrVJP/HEZyW55wPIntGgBpKbJxLMn5v2ardabzRAQu/kesRscYCS2cpIYZzeZjSIVBiARdE743CTuQZqQqKWyR4Uh6plNh/+oNbjKcf/APIevGsTgmiquUXYzsxgjelI58xiPpkfxrd4ABOi++sfGyEp1kCfFRDmvTPhTEz45j47AmUne4zKg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ug-0004lM-DA for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 33/58] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503118074 (code B ref 74290); Sun, 24 Nov 2024 07:57:22 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:11 +0000 Received: from localhost ([127.0.0.1]:60829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UU-0004hC-9J for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tq-0004Zh-I9 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:31 -0500 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 1tF7Tl-0002Cs-7E; Sun, 24 Nov 2024 02:56:25 -0500 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=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=; b=VPZxhDALCW+hbL8KHFv7 bDt7Uye3Ku8VeozpTwVVsiAIdPpzEBmrkYAwHqUv0rXhnAdBfgFVUvSnutnEj86Y8BtOFwzkGyd2f I0Fup1wjz5hyBL7wRA5QJVMYlrWy2ykgzniaSwUXmh+lrYjUdfDo98r76B0lx+8Kz3qgMlZICKmNl XQBymCrf7E8ROpnrkSnr30uYcaxtsH6yiMyjT1yp7bvECRkw7yy+Hp368zHqwyUWoiEsS5TXhxUd8 7Ah7aSlSznyo4Mj5yrJ7V+OrNGhtpgZZN1+hV3V6Z2rRVviizcpnhuZOKhIRimfdgmhtNB6Ztw8px fZYBsCcIZgECeA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:56 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/patches/libpciaccess-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/xorg.scm (libpciaccess) [arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + .../patches/libpciaccess-hurd64.patch | 58 +++++++++++++++++++ gnu/packages/xorg.scm | 23 +++++--- 3 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index ceddce8f78..adcbb55847 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1711,6 +1711,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ + %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch b/gnu/packages/patches/libpciaccess-hurd64.patch new file mode 100644 index 0000000000..f7e11059b1 --- /dev/null +++ b/gnu/packages/patches/libpciaccess-hurd64.patch @@ -0,0 +1,58 @@ +Upstream-status: Taken from upstream: + +. + +From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 28 Jun 2023 01:02:34 -0400 +Subject: [PATCH] Fix compilation warnings when building against hurd-amd64. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Passes mach_msg_type_number_t instead of size_t which have different +sizes. Example warning: + +/hurd_pci.c:101:53: warning: passing argument 3 of 'pci_get_dev_regions' from incompatible pointer type [-Wincompatible-pointer-types] + 101 | err = pci_get_dev_regions(d->device_port, &buf, &size); + | ^~~~~ + | | + | size_t * {aka long unsigned int *} +--- + src/hurd_pci.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/hurd_pci.c b/src/hurd_pci.c +index 8653e1b..9ac3813 100644 +--- a/src/hurd_pci.c ++++ b/src/hurd_pci.c +@@ -82,7 +82,7 @@ pci_device_hurd_probe(struct pci_device *dev) + struct pci_bar regions[6]; + struct pci_xrom_bar rom; + struct pci_device_private *d; +- size_t size; ++ mach_msg_type_number_t size; + char *buf; + + /* Many of the fields were filled in during initial device enumeration. +@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char *buf, + size_t * nbytes) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + + data = buf; +@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry) + { + char *data; + int nentries = 0; +- vm_size_t size; ++ mach_msg_type_number_t size; + + dir_readdir (port, &data, &size, *first_entry, 1, 0, &nentries); + +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 554dc21ba7..e78264ec6f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2023, 2024 Kaelyn Takata ;;; @@ -1169,16 +1169,17 @@ (define-public libpciaccess "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" + (list + ;; Make sure libpciaccess can read compressed 'pci.ids' files as + ;; provided by pciutils. + #:configure-flags + #~(list "--with-zlib" (string-append "--with-pciids-path=" (assoc-ref %build-inputs "pciutils") "/share/hwdata")) #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'install 'add-L-zlib (lambda* (#:key inputs outputs #:allow-other-keys) ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. @@ -1187,7 +1188,15 @@ (define-public libpciaccess (substitute* (string-append out "/lib/libpciaccess.la") (("-lz") (string-append "-L" zlib "/lib -lz"))) - #t)))))) + #t))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "libpciaccess-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~())))) (inputs (list zlib pciutils)) ;for 'pci.ids.gz' (native-inputs From patchwork Sun Nov 24 07:54:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33795 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 B5DF527BBEA; Sun, 24 Nov 2024 07:57:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 7D42C27BBE2 for ; Sun, 24 Nov 2024 07:57:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VB-0000ZR-0u; Sun, 24 Nov 2024 02:57:53 -0500 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 1tF7Uh-0000Oc-Lw for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500 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 1tF7Uh-0002Oi-Cp for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500 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=IdcQCyQ/vo8uDTni/SmHls3ywYSMyTuo8J3ltumovBA=; b=XV6x42ZyTL8TMaKixixIWSXM0HjgeJ0dd/Z77hwMA8c8gcRNvlR9E2mRWNaiXB+U4ne0AjRgcNcYG9l3WFpBoeVEmPs6BHf7TSSAJ27uUrUs/UZbBeyrPFDz95v5E1eI2XdOMZmHMo3lsO4E21TRsP3mR5BGr5O6qaVj8jbzP7vx0HWlLDsrmIQUkiIRaa11gJP+4Lgw1eMhitQjO6vwow4D8czbz9owoqWSP+gjfAUSbvrqwoYxU8Dc6DYLbGlYr1kNfSB6ek8cTHksvKUcyLyX8JNxBUWpKj2ZCGXJ/KX2uOFMNczcuGo6hj+9u3/CpCjE17qPvwEesjd1fb6bmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uh-0004lT-6u for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 34/58] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503218088 (code B ref 74290); Sun, 24 Nov 2024 07:57:23 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:12 +0000 Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UV-0004hT-Ap for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ts-0004Zv-Js for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:32 -0500 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 1tF7Tn-0002D4-Dd; Sun, 24 Nov 2024 02:56:27 -0500 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=IdcQCyQ/vo8uDTni/SmHls3ywYSMyTuo8J3ltumovBA=; b=XwjcOeNdW+cW5nYdQsnx Y2Otx+V8EjLd8Ld43SH3CnPlCFn4wr0mQQVwcFwtyF9n9sVoA8UYHPCvuzLINysTIs6eagqiYFIkn WnH0tnqUrsrTeTpio6KCORVUsibpPF2tOFZyZoZkR7k21K3gvkLr1bKSz5OjmSSoIgRuHQokhmX5L zYqaGcI9fY+0aiOovI0NiVV5hbY5H0IxjSf7OF4O5225AQDyml39yn0vrlEZ8oVsqt9OettxdvYON hCZUrqQl5/WDIGGhltUy0MXnmwkOGFu3xUGcfJE5LacLDbGWh0VJBOba1YENVgdehxjml4iodW50C aKSB71K+00cWtQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:57 +0100 Message-ID: <3651a6eed7932297fd7a6bf5c5f2a1f34a8ea913.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/hurd.scm (netdde): Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. (dde-sources): Update to b6c8526c703f3ba76294d9002f195c63897ec661. Change-Id: Id03f5c5124f16e9ffd6a77cbb2507d274e0f325a --- gnu/packages/hurd.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5fdb6359d1..2c231425aa 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -294,7 +294,7 @@ (define unifont (define dde-sources ;; This is the current tip of the dde branch - (let ((commit "066797b576ebf8364ad157f50bef2a655597deeb")) + (let ((commit "b6c8526c703f3ba76294d9002f195c63897ec661")) (origin (method git-fetch) (uri (git-reference @@ -302,7 +302,7 @@ (define dde-sources (commit commit))) (sha256 (base32 - "19f2awlfnar5gyhi0w5zawla5brzck2s88iv0f20022pd1l5v9hl")) + "0k1ilj8ghli8x43xaksbc4y419pqh0w16k374914c07svq419bbr")) (file-name (git-file-name "dde" (string-take commit 7)))))) (define %import-from-dde @@ -567,8 +567,8 @@ (define-public hurd (license gpl2+))) (define-public netdde - (let ((commit "e67c284ac113d939b10b4578334f27dab29d5b08") - (revision "2")) + (let ((commit "c0ef248dc7c5ccc1273e2a796f3ece30c5b645df") + (revision "3")) (package (name "netdde") ;; The version prefix corresponds to the version of Linux from which the @@ -582,7 +582,7 @@ (define-public netdde (patches (list (search-patch "netdde-build-fix.patch"))) (sha256 (base32 - "0vnkls7sr7srzib5mnw6gybzl5qa8c5a4zf3h08w6gdr7zqbndh0")) + "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh")) (file-name (git-file-name name commit)))) (build-system gnu-build-system) (arguments From patchwork Sun Nov 24 07:54:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33792 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 2AA9527BBEA; Sun, 24 Nov 2024 07:57:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 9C11627BBE2 for ; Sun, 24 Nov 2024 07:57:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uz-0000Vd-V9; Sun, 24 Nov 2024 02:57:44 -0500 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 1tF7Ui-0000Pi-Ag for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:24 -0500 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 1tF7Ui-0002Oq-1N for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:24 -0500 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=pdafoliq+nvOAg9oyl1+48DQztM0EimTR6FGR0o8AeQ=; b=YFSUmRUV6QBwrEwdJKwMaGXN1TcjErts4h1MExha2Osrn7YL9o+dfsjySCHVQQlRDYm5T3GjtduMO6eFdS43J6w7Mr4qeZS87LY8Iu0QnWMRci7gAF2v54MDNPG8cVwFgEEafoX0emsqySf4yAlycYyIIvNP8P95YsuwGDqz640EbzHlqWRGHhxSz4Sa9KZbqGnLnreWsDaEp9xoTQ92hpaSRJYVBCSQIZPw22rS9Z+VGdGL4ViyjflUfUqlMS70YlfQneYJosdYBx+d6uwbEWceeBpYsGqULC3zlOOwQ+/4Rx3kfn2PLg88D+U3uTrp4my9W9zORFz/TxMVdL6Uqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uh-0004lb-Rb for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 35/58] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503218103 (code B ref 74290); Sun, 24 Nov 2024 07:57:23 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:12 +0000 Received: from localhost ([127.0.0.1]:60835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UV-0004hh-Vy for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tt-0004Zy-DJ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:33 -0500 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 1tF7To-0002DC-6r; Sun, 24 Nov 2024 02:56:28 -0500 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=pdafoliq+nvOAg9oyl1+48DQztM0EimTR6FGR0o8AeQ=; b=FZE8Im1rSD2BnLsOkbOM oh2anv7Gu07k58auBrRSQnCFylqflenNfpghynA1A2ZXJNa5CoyhDLbLIpapqBaKWA96meusE6niB hbA67rm7oKpRsSY+q9hZXUW0JHqBvGM4fOkyyPxx2ImcHBliW1e+EDeNE88QKddY1T6+5gwQai36T CB7zNYW5AD5X9juPQ5oa94SJkI1iwpJeXBDutT8SYLb2m3ipZNBLwyzB9MLLfC6JQvUqT/qP7h3HL 91vqwZPUIfdRV99RxMY7fTl/+psmH9sYIvFXt42u1M85vHkiJI2qD3JuCDHzJSmkVv3lXxillU1Tn jLqRQi55Vi/qyg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:58 +0100 Message-ID: <556df9755809509a8ea1529ed93f1078f2da7dd2.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/netdde-csum.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (netdde)[source]: Use it. [arguments]: Do not assume x86, rather use actual ARCH in #:make-flags, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 19 ++++++++++++++++++- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index adcbb55847..2e18ed7870 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1824,6 +1824,7 @@ dist_patch_DATA = \ %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netdde-build-fix.patch \ + %D%/packages/patches/netdde-csum.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ %D%/packages/patches/netpbm-CVE-2017-2587.patch \ %D%/packages/patches/netsurf-message-timestamp.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2c231425aa..defa3f2689 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -579,7 +579,8 @@ (define-public netdde (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/incubator.git") (commit commit))) - (patches (list (search-patch "netdde-build-fix.patch"))) + (patches (search-patches "netdde-build-fix.patch" + "netdde-csum.patch")) (sha256 (base32 "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh")) @@ -599,6 +600,13 @@ (define-public netdde " -Wno-int-conversion" " -Wno-strict-prototypes") "ARCH=x86") + (let ((arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64")))) + (string-append "ARCH=" arch))) #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) #:phases @@ -616,6 +624,15 @@ (define-public netdde (("/bin/bash") (which "bash"))))) (add-after 'patch-generated-file-shebangs 'build-libdde-linux26 (lambda* (#:key make-flags #:allow-other-keys) + (when ,(target-hurd64?) + (let ((dir "libdde_linux26/build/include")) + (mkdir-p (string-append dir "/x86")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/x86/amd64") "x86") + (symlink "x86" (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64")))) (with-directory-excursion "libdde_linux26" (apply invoke "make" (delete "PKGDIR=libdde_linux26" make-flags))))) diff --git a/gnu/packages/patches/netdde-csum.patch b/gnu/packages/patches/netdde-csum.patch new file mode 100644 index 0000000000..4fdd004898 --- /dev/null +++ b/gnu/packages/patches/netdde-csum.patch @@ -0,0 +1,18 @@ +Upstream-status: Taken from debian. + +. + +--- + linux/drivers/net/vmxnet3/vmxnet3_drv.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/linux/drivers/net/vmxnet3/vmxnet3_drv.c ++++ b/linux/drivers/net/vmxnet3/vmxnet3_drv.c +@@ -25,6 +25,7 @@ + */ + + #include "vmxnet3_int.h" ++#include + + char vmxnet3_driver_name[] = "vmxnet3"; + #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver" From patchwork Sun Nov 24 07:54:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33832 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 7665127BBE2; Sun, 24 Nov 2024 07:59:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 D7B6027BBE9 for ; Sun, 24 Nov 2024 07:59:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VE-0000cG-93; Sun, 24 Nov 2024 02:57:57 -0500 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 1tF7Uj-0000Qe-HM for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 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 1tF7Ui-0002Ow-Ov for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 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=Ml7qt6m977oIZHOXMwWHbWIc+SYvMnIygOWThmx+pv8=; b=UKi+GWJX7ag1+OdYXeDZqdI6e8MFpq0YZm5NuWqkKoq17a2jW+VvPnN/PdsIY4mVvScdlp5Dqo8EHJ2WG6Yd71MxWzJx5fvQrr/qhlu/h290rpoQ4eS2NoLMoLAVUtoBqL4gj3nahDDayudIl/DvsTPGD66feqzh3jAmp3Qfm9udAVXLjPK5EmgoiTyKknGYHSX9mQrlnWXywM5zyk0fgn+T01/ECxFUG+HyAQWg0K5FzTzrp8W8riet9OfTiMhdUOiKu2lk1PJZJMsTX26ZeI3m+/k66R/XO0fQcmRtZ1WyiH3W5EzeRJe0vPxcnvkUdKrSWWKpvnZyuMlafmtSDw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ui-0004lq-JS for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:24 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 36/58] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:24 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503318113 (code B ref 74290); Sun, 24 Nov 2024 07:57:24 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:13 +0000 Received: from localhost ([127.0.0.1]:60838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UW-0004hy-My for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tu-0004a5-F5 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:34 -0500 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 1tF7Tp-0002DO-8g; Sun, 24 Nov 2024 02:56:29 -0500 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=Ml7qt6m977oIZHOXMwWHbWIc+SYvMnIygOWThmx+pv8=; b=HvYRVoXnVu7xAE93KNwZ beg9IB2Pc18f0tg6b7GLd2KjBnaOR9GeYhIvDMpg/BCSBjZJC4uOtvyegs7TTpY10HzqkOd/cRmfg cL/5yIBW55cUkwa1ogyW/gAk+nU0EKiXPUqGsisIdO4KSKasBAhrOL9uUsYOnT2+j4ukYwVN4mQgs sJKyTp9VP2jblEieOLIVsGdCoriWBf/5I8ZlJgjojOQMGiVaVYcg3bvLjEsBf3ku3pwn7seAXw/m6 nUfKjlhyZm1apdN/8DOz8n2TK8JlH0kiZRQWXNIWvWPhIYytOGtJCCJqAplHcX1zvR8YRhb2DNDM1 Uf5amWp8MbOAXQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:59 +0100 Message-ID: <0ddd330a8eea08ddb63e3fa0efb0476b44efe14b.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/hurd.scm (rumpkernel): Update to f1ffd6405f225336e595a0f99f01095ed7438337. [arguments]: In stage "build", add "-Wno-error=sign-compare" to CWARNFLAGS. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/packages/hurd.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index defa3f2689..0df514cc78 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -676,8 +676,8 @@ (define-public netdde (license gpl2)))) (define-public rumpkernel - (let ((commit "81043d42fabda9baed7ac9ca36e3f3f5ed11ba81") - (revision "3")) + (let ((commit "f1ffd6405f225336e595a0f99f01095ed7438337") + (revision "0")) (package (name "rumpkernel") (version (git-version "0-20211031" revision commit)) @@ -691,7 +691,7 @@ (define-public rumpkernel (commit commit))) (sha256 (base32 - "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r")) + "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -811,7 +811,8 @@ (define-public rumpkernel " -Wno-error=stack-protector" " -Wno-error=array-parameter" " -Wno-error=array-bounds" - " -Wno-error=stringop-overflow") + " -Wno-error=stringop-overflow" + " -Wno-error=sign-compare") "-V" "LIBCRTBEGIN=" "-V" "LIBCRTEND=" "-V" "LIBCRT0=" From patchwork Sun Nov 24 07:55:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33838 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 3615E27BBE2; Sun, 24 Nov 2024 07:59:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 A6EAE27BBEA for ; Sun, 24 Nov 2024 07:59:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7WT-0002Cd-NG; Sun, 24 Nov 2024 02:59:13 -0500 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 1tF7Ul-0000Qz-1m for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:30 -0500 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 1tF7Uj-0002PR-H4 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; b=cFDzokb0P15Pk220KCyrimKdIsS6j2vEkrydXSSpyDWFJU/KCnZ9nH/aN+goxq8XRcrcUtwdw2aWQICtt+P2t0GYTxTLsV+feAVE709YN05QMkM8onfe5sGR+vl0WPb8Xa+mgVOP39DC0jhf6x9gXicrOnGsHXT1l/v4U7hSeeyJ9mbEFNopYZwp6ojqmhDloW+WY711bkqgvnIZEnTk+LNPaAHQv/lQeOYyb6Kgv+eUG23SiUi3yy2c4IgEuTJ85ZSnL2L0F/HZ/c4VMWmObWBTuwzTTMLr98GY6GlOFdg/jg1TZa7DBJa0DdywrEdSYg1bBBetpyLlVBWXdE9eLA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uj-0004lz-8q for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 37/58] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:25 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503318126 (code B ref 74290); Sun, 24 Nov 2024 07:57:25 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:13 +0000 Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004i5-47 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tv-0004aI-R3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:36 -0500 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 1tF7Tq-0002DY-B7; Sun, 24 Nov 2024 02:56:30 -0500 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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; b=Pm1yrP5rE4jYzLCJ6mD1 znVg5DM5LIgoEyQhSPk3F+lDiOE0UYXPL1aRlGOn/zQoolETdMIFH1Ni9Z3sBONr6BfX8W6qAnEif qqygvbYIAOAtiRvF1nX8gYJcZ9HFpkLYwIo4rypEgTTQYA3GFPox/V84twP/u2a4R0tiQNhDjK0vG RKo3g3zuJH/I8NXN3OuLWr7RyvbjO10Mgw7LlD4oZHUzPvMa3Q27C3oTRLF9Tts5x3xam8NWK42E6 33LTtfkHMLxlyaUBPLiw6LSvG+gd/5xzfsLU8SV/F/iEjmpjavsmaSbzuHzBngoKZl/a3gCDZig8t jkg9SKRJn2u7KQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/hurd.scm (rumpkernel)[argument]: In stage "build", follow Debian upstream to use -DPAE disable the DTRACE and ZFS builds. Change-Id: I534da31eefb378c72b4896d64a51a73109e38aa6 --- gnu/packages/hurd.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 0df514cc78..6701d00251 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -792,6 +792,9 @@ (define-public rumpkernel "-V" "MKBINUTILS=no" "-V" "MKGDB=no" "-V" "MKGROFF=no" + "-V" "MKDTRACE=no" + "-V" "MKZFS=no" + "-V" (string-append "TOPRUMP=" toprump) "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" @@ -802,7 +805,8 @@ (define-public rumpkernel " -DRUMP_REGISTER_T=int" " -DRUMPUSER_CONFIG=yes" " -DNO_PCI_MSI_MSIX=yes" - " -DNUSB_DMA=1") + " -DNUSB_DMA=1" + " -DPAE") "-V" (string-append "CWARNFLAGS=" " -Wno-error=maybe-uninitialized" From patchwork Sun Nov 24 07:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33812 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 7748C27BBE2; Sun, 24 Nov 2024 07:58:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 6718E27BBEB for ; Sun, 24 Nov 2024 07:58:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vu-0001Xv-IV; Sun, 24 Nov 2024 02:58:39 -0500 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 1tF7Ul-0000R0-3p for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uk-0002PU-AN for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 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=AlGqGL75ySyrk8iZymv7a6Z1oJ7DOO8fftgkErDQE0U=; b=oiNe/70nqCzGBc88PywLHJA2Za92xiNJ6ICNwb4V+GOXXrWS/1eIVsILouOtn9phf9EaEexw8HtWsRI6IKfr9PRrXZQKUGxJw9yDFrIcC2I3fJBa6lnkO8DRtH+vd5RCb4YJiufXpyfLnIsxQx9zAwxoVriis44Q3GnUQm6u3C6PYlFSfoLSGgz9wozQGy2na1AbZPLdqhd5g7v2d4Eg8xG3E3C9Ltu+bFgQ54XHLaVd/gcxg+oZE7W5DX0SKN5KhnHT+I5NA+w/vvNJnKeg/B3xoK128UoAO9dyTIDSyHrW1eHUU0KQU645touKuHwi9bTJC1M9XrEDas2GeWZPDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mJ-3d for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 38/58] gnu: hurd: Build fixes for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:26 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503418144 (code B ref 74290); Sun, 24 Nov 2024 07:57:26 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:14 +0000 Received: from localhost ([127.0.0.1]:60843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004iJ-Jw for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tw-0004aK-CO for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:37 -0500 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 1tF7Tr-0002ET-6P; Sun, 24 Nov 2024 02:56:31 -0500 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=AlGqGL75ySyrk8iZymv7a6Z1oJ7DOO8fftgkErDQE0U=; b=IeSA7zJ6ovAcGHwbCISu /0wxxShXyHazQWeVVfWiDKazz5co43SN7MoF6Yq0dTLcKGXA0j4ByaaExQ78s7rX7PvS7TunSqQuc T1an+nSoLYLN3jchhbGU9vBPv8nd8WjyV5siqV+ikXqzwLuxvg7dNPtzA2jb8jI08wJ9Cj3k48/WW fJYTD1eAfcS/s+xLUTGPyiciYJZuhcR/llgjnZaePM2FV/Dmpv4k+3Y0h3xzdiuCgLXODdtrbrDv/ 7xFzL3q08S8+OLReVUPwFxWdxY4MlyRPMZPOB/NjrKtsvNcWOBvIiCBCvHSHe0xWGvriVBBwRwUYg GGTEcvOjDAWKwg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:01 +0100 Message-ID: <6e35b48b7ef3cc93c0f0a9bcd859531ba4fa9cb5.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/hurd-64bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (hurd)[source]: Use it. [arguments]: When building for the 64bit Hurd, add "create-machine-symlink" phase. In phases "build-libdde-linux" and "install-goodies", do not assume x86, rather use actual ARCH, and follow upstream's "amd64" symlinking voodoo. Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 126 ++++++++++++++++---------- gnu/packages/patches/hurd-64bit.patch | 56 ++++++++++++ 3 files changed, 135 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e18ed7870..eb1bc43276 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1553,6 +1553,7 @@ dist_patch_DATA = \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ + %D%/packages/patches/hurd-64bit.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-startup.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 6701d00251..63249b4ef7 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -317,7 +317,8 @@ (define-public hurd (source (origin (inherit (package-source hurd-headers)) (patches (search-patches "hurd-rumpdisk-no-hd.patch" - "hurd-startup.patch")))) + "hurd-startup.patch" + "hurd-64bit.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target @@ -467,54 +468,84 @@ (define-public hurd (find-files (string-append out "/libexec"))) #t))) (add-after 'build 'build-libdde-linux - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (invoke (string-append (assoc-ref (or native-inputs inputs) "make") - "/bin/make") - ;; XXX There can be a race condition because subdirs - ;; aren't interdependent targets in the Makefile. - "-j1" "-C" "libdde_linux26" - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) "bash") - "/bin/bash") - (string-append "CC=" - ,(cc-for-target)) - (string-append "WARNINGS=" - " -Wno-declaration-missing-parameter-type" - " -Wno-implicit-function-declaration" - " -Wno-implicit-int" - " -Wno-int-conversion" - " -Wno-strict-prototypes") - "ARCH=x86"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64")))) + (when ,(target-hurd64?) + (let ((dir "libdde_linux26/build/include")) + (mkdir-p (string-append dir "/x86")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/x86/amd64") "x86") + (symlink "x86" (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64")))) + (invoke (string-append (assoc-ref (or native-inputs inputs) "make") + "/bin/make") + ;; XXX There can be a race condition because subdirs + ;; aren't interdependent targets in the Makefile. + "-j1" "-C" "libdde_linux26" + (string-append "SHELL=" + (assoc-ref (or native-inputs inputs) "bash") + "/bin/bash") + (string-append "CC=" + ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") + (string-append "ARCH=" arch))))) (add-after 'install 'install-goodies - (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) - ;; Install additional goodies. - ;; TODO: Build & install *.msgids for rpctrace. - (let* ((out (assoc-ref outputs "out")) - (datadir (string-append out "/share/hurd"))) - ;; Install libdde_linux26. - (invoke (string-append (assoc-ref (or native-inputs inputs) "make") - "/bin/make") - "-C" "libdde_linux26" "install" - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) "bash") - "/bin/bash") - (string-append "INSTALLDIR=" - out - "/share/libdde_linux26/build/include") - "ARCH=x86") - ;; Install the fancy UTF-8 motd. - (mkdir-p (string-append out "/etc")) - (copy-file "console/motd.UTF8" - (string-append out "/etc/motd")) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + ;; Install additional goodies. + ;; TODO: Build & install *.msgids for rpctrace. + (let* ((out (assoc-ref outputs "out")) + (datadir (string-append out "/share/hurd")) + (arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64"))) + (dir (string-append out "/share/libdde_linux26/build/include"))) + (mkdir-p dir) + (when ,(target-hurd64?) + (mkdir-p (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") + "x86") + (symlink "x86" (string-append dir "/amd46"))) + (invoke (string-append (assoc-ref (or native-inputs inputs) "make") + "/bin/make") + "-C" "libdde_linux26" "install" + (string-append "SHELL=" + (assoc-ref (or native-inputs inputs) "bash") + "/bin/bash") + (string-append "INSTALLDIR=" dir) + (string-append "ARCH=" arch)) + (when ,(target-hurd64?) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") + "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64"))) + ;; Install the fancy UTF-8 motd. + (mkdir-p (string-append out "/etc")) + (copy-file "console/motd.UTF8" + (string-append out "/etc/motd")) - ;; Install the BDF font for use by the console client. - (copy-file (assoc-ref inputs "unifont") - "unifont.gz") - (invoke "gunzip" "unifont.gz") - (mkdir-p datadir) - (copy-file "unifont" - (string-append datadir "/vga-system.bdf")) - #t)))) + ;; Install the BDF font for use by the console client. + (copy-file (assoc-ref inputs "unifont") + "unifont.gz") + (invoke "gunzip" "unifont.gz") + (mkdir-p datadir) + (copy-file "unifont" + (string-append datadir "/vga-system.bdf")))))) #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") @@ -599,7 +630,6 @@ (define-public netdde " -Wno-implicit-int" " -Wno-int-conversion" " -Wno-strict-prototypes") - "ARCH=x86") (let ((arch ,(match (or (%current-target-system) (%current-system)) ((? target-x86-32?) diff --git a/gnu/packages/patches/hurd-64bit.patch b/gnu/packages/patches/hurd-64bit.patch new file mode 100644 index 0000000000..643550ad68 --- /dev/null +++ b/gnu/packages/patches/hurd-64bit.patch @@ -0,0 +1,56 @@ +Upstream-status: Taken from upstream: + . + +From d494333e7607ea03819adcfb69d89f8248ec2044 Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Sun, 21 Jul 2024 17:20:55 -0400 +Subject: [PATCH] nfsd: fix -Werror=incompatible-pointer-types issues for + x86_64 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Message-ID: <3pmgbk2myx4phdb6wcso54solmybulrvbytols5md3nri2p2qp@xjmfmpvwjp6t> +--- + nfsd/cache.c | 2 +- + nfsd/ops.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nfsd/cache.c b/nfsd/cache.c +index cd5524af..864739c0 100644 +--- a/nfsd/cache.c ++++ b/nfsd/cache.c +@@ -387,7 +387,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) + struct cache_handle *c; + int hash; + char *bp = fhandle.array + sizeof (int); +- size_t handlelen = NFS2_FHSIZE - sizeof (int); ++ mach_msg_type_number_t handlelen = NFS2_FHSIZE - sizeof (int); + mach_port_t newport, ref; + + /* Authenticate USERPORT so that we can call file_getfh on it. */ +diff --git a/nfsd/ops.c b/nfsd/ops.c +index 463a9c87..64e94b93 100644 +--- a/nfsd/ops.c ++++ b/nfsd/ops.c +@@ -292,7 +292,7 @@ op_write (struct cache_handle *c, + off_t offset; + size_t count; + error_t err; +- mach_msg_type_number_t amt; ++ vm_size_t amt; + char *bp; + struct stat st; + +@@ -583,7 +583,7 @@ op_readdir (struct cache_handle *c, + error_t err; + char *buf; + struct dirent *dp; +- size_t bufsize; ++ mach_msg_type_number_t bufsize; + int nentries; + int i; + int *replystart; +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Sun Nov 24 07:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33819 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 131B727BBE9; Sun, 24 Nov 2024 07:58:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 B633B27BBE2 for ; Sun, 24 Nov 2024 07:58:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vu-0001YY-Rg; Sun, 24 Nov 2024 02:58:39 -0500 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 1tF7Ul-0000RP-6v for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uk-0002Pe-UE for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=EVQtiI4oQYLUzFRP+c4+YjSSrp/LmWEEess5slGp9sH8SW0S2cqHKNIqtcnK4Ge2893y7qrSfzk9Hh+um8e04OK1YQpjyaG/1aVGSd7OG4mnw92kXqyAR3ABj7t9IA/cs4USWJXcXl8kXUx2dtLHdIQs/bA1BPsC5VGxwX+uozyiQKb0ubnDa5imA5Cuk+tlpI2uIPnUM7PCHkiDAYFy01u7BrW93KtkgmwM8ERBwcq+x2+vGHF0oAJluWPCEqzNq1BiiDYV4Llc9tv8RUqqeNpXWbUsyKjfiMxnBnQtUhLl3DE0L+Btxd+aWR8qcBs8y+0dPdpMBL6mbfF0HtGGzA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mY-OB; Sun, 24 Nov 2024 02:57:26 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 39/58] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:26 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503518165 (code B ref 74290); Sun, 24 Nov 2024 07:57:26 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:15 +0000 Received: from localhost ([127.0.0.1]:60847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UY-0004ib-Ki for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ty-0004aX-T8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:39 -0500 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 1tF7Tt-0002FF-Mc; Sun, 24 Nov 2024 02:56:33 -0500 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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=BnSMrDvCppt5tcFEzfx3 8XwVCacgPA4LCDRP3HGjJjzvxe9/noMQVCbIi2+roVsjqNBNgqsxbIF0Jkh4azJkWr4Fl91FEoMZT voRZutli7jSZX6lI7Wy7jsU+CvpLj2ud6LjgD2VmIPMQEc2C0Y+TfjcXQTP2EEj81jfufuctqVVO7 1NE2OkKrJqc42/PbU14GGV13XUYxmno5M1s2XN96goszZ963a/9S6TtZzupEPecLPkC8MrEX6BUDk XDO1iLfoxkJS2ekbvZIr1DLQ832d12EYRO5k1ylVVK3fH9f0Qib7DdGEnkLcRrjdLPlQjuopLaK8k CaqSEwo/7sToqw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:02 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/patches/inetutils-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/admin.scm (inetutils)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd64-patch" stage. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/local.mk | 1 + gnu/packages/admin.scm | 14 ++++- gnu/packages/patches/inetutils-hurd64.patch | 65 +++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/inetutils-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index eb1bc43276..c8fbae91fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1577,6 +1577,7 @@ dist_patch_DATA = \ %D%/packages/patches/indent-CVE-2024-0911.patch \ %D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ + %D%/packages/patches/inetutils-hurd64.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 46282da67e..fbf3e26a3f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith @@ -1044,7 +1044,17 @@ (define-public inetutils "\\\"")) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". - #:parallel-tests? #f)) + #:parallel-tests? #f + #:phases (if (target-hurd64?) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "inetutils-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (inputs (list coreutils shadow ;for login (used in telnetd and rlogind) diff --git a/gnu/packages/patches/inetutils-hurd64.patch b/gnu/packages/patches/inetutils-hurd64.patch new file mode 100644 index 0000000000..3fb238bcdc --- /dev/null +++ b/gnu/packages/patches/inetutils-hurd64.patch @@ -0,0 +1,65 @@ +Upstream-status: Not presented upstream. + +From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 8 Nov 2024 11:07:56 +0100 +Subject: [PATCH] ifconfig hurd: Build fix for the 64bit HUrd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +* ifconfig/system/hurd.c (check_driving): Use mach_msg_type_number_t +instead of size_t for file_get_fs_options. +--- + ifconfig/system/hurd.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +index 70b2ed27..86fe6375 100644 +--- a/ifconfig/system/hurd.c ++++ b/ifconfig/system/hurd.c +@@ -47,7 +47,7 @@ check_driving (const char *name) + error_t err; + + char *argz = 0, *new_argz = 0; +- size_t argz_len = 0; ++ mach_msg_type_number_t argz_len = 0; + char *entry = 0; + const char *socket = _SERVERS_SOCKET "/2"; + +@@ -106,7 +106,9 @@ check_driving (const char *name) + new_argz = malloc (argz_len); + memcpy (new_argz, argz, argz_len); + +- err = argz_insert (&new_argz, &argz_len, new_argz, name); ++ size_t new_argz_len = 0; ++ ++ err = argz_insert (&new_argz, &new_argz_len, new_argz, name); + if (err) + { + error (0, err, "Could not prepend name %s to '%s' for %s", name, +@@ -114,7 +116,7 @@ check_driving (const char *name) + goto out; + } + +- err = argz_insert (&new_argz, &argz_len, new_argz, "-i"); ++ err = argz_insert (&new_argz, &new_argz_len, new_argz, "-i"); + if (err) + { + argz_stringify (new_argz, argz_len, ' '); +@@ -122,10 +124,10 @@ check_driving (const char *name) + goto out; + } + +- err = fsys_set_options (fsys, new_argz, argz_len, 1); ++ err = fsys_set_options (fsys, new_argz, new_argz_len, 1); + if (err) + { +- argz_stringify (new_argz, argz_len, ' '); ++ argz_stringify (new_argz, new_argz_len, ' '); + error (0, err, "Could not make pfinet %s drive %s with '%s'", socket, + name, new_argz); + goto out; +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Sun Nov 24 07:55:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33808 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 B0C7727BBEC; Sun, 24 Nov 2024 07:58:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 D59FC27BBE2 for ; Sun, 24 Nov 2024 07:58:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VJ-0000lp-6i; Sun, 24 Nov 2024 02:58:01 -0500 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 1tF7Uo-0000SG-Uu for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Un-0002Q1-0Z for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:30 -0500 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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=; b=UxyrlKaudG3bWnR2Q3tMMRn2OuZ8x2Y3GIxg0grts9vCxZEtR9XaxrKiQ+4emiD8wM/KZIWR7YbSgGDD4epU9qZlp/ahwMdMCuvovNTmagKrAA+tSB/Bc0Ct+wsTs9bNIYgHfoeHCN2NcwOa4uzHBgK0Ium34jBFag2GGzSY6ppS4H+DvSPWY+QcrowuhT6BiVv+X9TZD4iVSa7emUY21F9Ld/eLRPitAlxBoPKM1IgLSXVyQTf3G4ESZRVDg3sUWg+zNm23t0gVPKBPp+e75q34I5sLSxA6jvBPUtLYFHeoIwUgxOWsy5LBeQQkrNNnA1MjDRgw7ivYt3NTwRGDhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ul-0004ms-JI; Sun, 24 Nov 2024 02:57:27 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 40/58] gnu: grub: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:27 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503618180 (code B ref 74290); Sun, 24 Nov 2024 07:57:27 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:16 +0000 Received: from localhost ([127.0.0.1]:60853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UZ-0004iw-Ho for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U0-0004al-3B for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:40 -0500 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 1tF7Tu-0002FR-Sh; Sun, 24 Nov 2024 02:56:34 -0500 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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=; b=mpU8In7TiBiaVOOct4eL awbpfISh1c0BvWi5GSaZ8Ev9Lzq3tRMt3lVK4a5vqEFA74kpeJcHLA4BEOcwH84eaJFnHfZTXTcAT vNmDnM6c5YS6hd4uFKb7P/6wHlzASPcFp1gGSKJDDLJwc2fC7n6QytUnv85nAGRnYptxce/L9iJJe zRuroW1poZJsxD7SUyaWEohZcc+hvCmgTGNv/VuKw1YVCNdO/r3DxcKIcekyKHOz8ddwrJKqSLqrf uf7NgmdVvP96ySSwCVDnmdfFdkcM0aRQbrpRhmcen3pyPcwXNwq2ueYtvRmOJepHsPS3c2DIA/GkX l3sZ+28aS8D86A==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:03 +0100 Message-ID: <83559b59e4ba686c97349edba97af73f443df071.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/grub-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd64-patch" stage. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 8 +++++++ gnu/packages/patches/grub-hurd64.patch | 32 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/grub-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8fbae91fc..3595c68800 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1494,6 +1494,7 @@ dist_patch_DATA = \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-hurd64.patch \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index da5abaca55..61ea74b69a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -192,6 +192,14 @@ (define-public grub (setenv "BUILD_FREETYPE_CFLAGS" (string-append "-I" freetype "/include/freetype2")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "grub-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, see: diff --git a/gnu/packages/patches/grub-hurd64.patch b/gnu/packages/patches/grub-hurd64.patch new file mode 100644 index 0000000000..d5acd99eb8 --- /dev/null +++ b/gnu/packages/patches/grub-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Not presented upstream. + +From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 8 Nov 2024 11:47:49 +0100 +Subject: [PATCH] osdep/hurd: Support the 64bit Hurd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device): +Use mach_msg_type_number_t instead of size_t. +--- + grub-core/osdep/hurd/getroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c +index 0efefdab4..b849700e6 100644 +--- a/grub-core/osdep/hurd/getroot.c ++++ b/grub-core/osdep/hurd/getroot.c +@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path) + file_t file; + error_t err; + char *argz = NULL, *name = NULL, *ret; +- size_t argz_len = 0; ++ mach_msg_type_number_t argz_len = 0; + int i; + + file = file_name_lookup (path, 0, 0); +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Sun Nov 24 07:55:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33824 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 C089327BBF2; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 8A02927BBEA for ; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VE-0000cR-9b; Sun, 24 Nov 2024 02:57:57 -0500 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 1tF7Uo-0000SE-TQ for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Um-0002Px-5O for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:29 -0500 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=AGtCbpIid0l9wKezu1kLl0tFfCKP2Yv55BYjeUTXYbs=; b=TM1iYnUv2R1Buay5WJ0gnnw5jg/onrk4lJG/pxU7rIVNGc9hrLC4ZWFa6v9uuHfGi41nMNG8u0ocIBHGqxsJkczRFxNGXn/FA90yiEjWg4MGs6YIlK7TA0e0Q+Bz0waiRhejZHM4YAdSl9pkCAqn6Kjuy4Y7sn83RbSQR9pF9RJbUhPOdLT+Ar3NB5tUbj3C2vV/dcp3JscHO4zoCA5w1t8MunUltFo36OF9fv3YZ0hJtHpDJCUQutEwrYfnbMBzGoZkcfGEgDbcKb8ASt8lqRx9K2VMivHk7g7dPmW8z5JgAdKzpSHSyhDPZoP8xOFwjEJhf7SClohAZaUldzUkjQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Um-0004n0-0k for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:28 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 41/58] gnu: guile-fibers: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:27 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503618189 (code B ref 74290); Sun, 24 Nov 2024 07:57:27 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:16 +0000 Received: from localhost ([127.0.0.1]:60857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004jB-A4 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U1-0004at-R8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:42 -0500 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 1tF7Tw-0002Fo-L6; Sun, 24 Nov 2024 02:56:36 -0500 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=AGtCbpIid0l9wKezu1kLl0tFfCKP2Yv55BYjeUTXYbs=; b=AkIpCiwonz7riD3qcVQa c4bvhbVOMNkWcAM46Os1PtpnYe+As6EGJfVmndCZdWDgYrHM0tuVFTNnxZN5DAusUJskp8bafeoEK ELRrgrs90lb+/yAt3G8+ElN1YEGZVTAAjlgGrBY3yWfoCbLCXfwqOsztXJAa+UHsXbDzIEAWi+2EV xxCaOG+nBR52f8FqJqg97E3Mb4zgwLBWh1qulmevTUBngs3EE2i4a1Z226TdXnfEBLReTpUTkgDGV KVC5jxctYGiXv9NYnwWu9AnjyxZOs4LhRbkNJSHrzofsYLAXsvh7Im7xSrQnqdXE1+pZtB/IkG68B yf62HoW51k0xtw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:04 +0100 Message-ID: <2b5741e05746a60fe2b50dcb44c5f5553d70077b.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/guile-xyz.scm (guile-fibers)[arguments]: Also modify phases for the 64bit Hurd. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a21289d368..bd5878d229 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -856,7 +856,7 @@ (define-public guile-fibers (list #:make-flags #~(list "GUILE_AUTO_COMPILE=0") #:phases - (if (target-x86-64?) + (if (and (target-x86-64?) (not (target-hurd?))) #~%standard-phases #~(modify-phases %standard-phases (add-before 'check 'disable-some-tests From patchwork Sun Nov 24 07:55:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33816 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 D31E127BBEA; Sun, 24 Nov 2024 07:58:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 97F8827BBE2 for ; Sun, 24 Nov 2024 07:58:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vk-0001Ji-G0; Sun, 24 Nov 2024 02:58:28 -0500 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 1tF7Uo-0000SF-TP for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Um-0002Py-JH for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:30 -0500 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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=pvob7yjll589zjQCxskUoke74c2fUoNymhbYQ5NM2Gg1brQ/BaZNgMTksMRTUwSwRCc4/eAibLH46AVpIFp1yIq4gozpC4qo3tz3DI6Isuv1Oa2tP67NqCKN/Nfszf2MRDX3AUF/dh1hIA3XGoSdJDVsivV6JIVzFah/M4e5TJvHGGNf/SOJS2cfqEFTahVzJzdHgTc08nSc9cKUiNDqMOYfxo0KnuePy6pL+3ggj0m4tVYJ1g3UK1WRTMndox/LuSzP3EnrOgvkAoJuXCGS5iqQdTHTqoHnsxvFNwnaZDhCocsVoHIX7x8UTK2SKUvQOBiwqVeGyJE5sEPzD7lMpQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Um-0004n9-F3 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:28 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 42/58] gnu: m4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:28 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503718205 (code B ref 74290); Sun, 24 Nov 2024 07:57:28 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:17 +0000 Received: from localhost ([127.0.0.1]:60859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004jK-PX for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U2-0004b2-Oa for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:43 -0500 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 1tF7Tx-0002G2-IO; Sun, 24 Nov 2024 02:56:37 -0500 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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=gcTC9v2EbMq8Tswx/2uN 4MLZ+ATn3c8QbXkpz+MDBjhzX/adgr4+vNSFmtmpftLEirn+tWNAJKbaWswZ0oeWauTbh/3z13G4/ sk/7OkgWCpy7DV2ev44oQhqtTFTR2DU9O2tJn9ZB+hqnUitz2jsSt2CtYLmFXXqqtC/L9dauQFeV5 bL76zz0rJXyUvEPc625Dlf1NpR+pI3B9FQ+DD813Z3NYkMrZ3raHxNppdLToEPhT2qyrKo5U1JiEx EwQxyAGl+m22P1cTJvKsYSI+Gig/VkoQw5UVO5jpBA997kigtWS4wyfGJSVLQaUDsBI6fdm49Hu0A 9E4pzgrQnTsPdA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:05 +0100 Message-ID: <4c8ab0e1115b295761e5fe5ec4b9a3a1c06d6d00.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I82993ebde268867348893556a9476faa5c4e9453 --- gnu/packages/m4.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index 39b50b6800..081304db34 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2022 Marius Bakke -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +64,13 @@ (define-public m4 (("(^| )main *\\(.*" all) (string-append all "{\n exit (77);//")))))) '()) + ,@(if (target-hurd64?) + '((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + '()) (add-after 'unpack 'configure-shell (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((/bin/sh (search-input-file (or native-inputs inputs) From patchwork Sun Nov 24 07:55:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33798 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 D3EA027BBEA; Sun, 24 Nov 2024 07:58:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 9A0F327BBE2 for ; Sun, 24 Nov 2024 07:58:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VG-0000ik-Ur; Sun, 24 Nov 2024 02:57:59 -0500 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 1tF7Uo-0000SH-VS for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uo-0002Q3-A7; Sun, 24 Nov 2024 02:57:30 -0500 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=WUZeir+Y0D5Fntp393hj0+/RZuqCHnBVhXweLV0Sl2A=; b=S2Z/QPcmtxGaIzVOXf+XqgdM2qVkRpgL1TTOlftI58WN7YPJJYI6Cc0bCCiruhiAILbVE9ehkWIQ2u29XU9gHYhzk55QArc0V+AAAFsAx7vqNIbGtTdkPP+QRXJABqZAnxbx/te7l1qf2TrTWb6UZCb7ckhHuBoY6Ri2DoQmrQ/2S+hdVaKpOPk+2+tO11wh9/kAt7Yxd/lJOdFIwD6CtjH2GWThugWL+E19zOMDAb+vjhqubSLQBF+slr8IsK7Lbvjt4b/dg1bfjg5mOFmNnYjDSGUzk0KKLzYBgTcUU0t0a3j+5a8DqdbW0Klv1eQ6Bss5fMnW3ipKnS13XWLk4A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Um-0004nH-To; Sun, 24 Nov 2024 02:57:28 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 43/58] gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:28 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503818219 (code B ref 74290); Sun, 24 Nov 2024 07:57:28 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:18 +0000 Received: from localhost ([127.0.0.1]:60862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jZ-Fa for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U3-0004b4-UG for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:44 -0500 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 1tF7Ty-0002GE-Nu; Sun, 24 Nov 2024 02:56:38 -0500 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=WUZeir+Y0D5Fntp393hj0+/RZuqCHnBVhXweLV0Sl2A=; b=okqxDF96jXvBGDy0uHvR ygNRglceeEscKzMGzMLE+upOZ2Ss5K/PKwruAGXRhvC8xmAhTJ9qZuli9Hy1mpC/hO6BHtZpuz/8k W4rspLv8uPdwUzXOWJPKVFVb/xhFOTFelYGfZ3bLRlVzfAE2U8qewmrmwOgyzOXSaOpeUoS/w2hDY vbNfG43PckPCuOZR5v6JSC+Q3vYZAiGijNHomySZKt4I3o3a/OMcCp3r14zRUGYqteuTkZ0ganlU5 YRdC4AxemTgrmWSjizMZ3Hs7z8vRIb2EYKDuEHmHX7gA7hjQ9sJwpNLbbRlf7mSwXO9g2ngUVSxAx A1kWMAWCc+Ifcw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:06 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/commencement.scm (gnumach-headers-boot0): Update to 1.8+git20240714. Change-Id: If30d7b4a688070d70741173c97a60284ca8299ef --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1cfaaae1e7..2f805b3e63 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2635,7 +2635,7 @@ (define gnumach-headers-boot0 (package (inherit gnumach-headers) (name "gnumach-headers-boot0") - (version "1.8+git20230410") + (version "1.8+git20240714") (source (origin (inherit (package-source gnumach-headers)) @@ -2649,7 +2649,7 @@ (define gnumach-headers-boot0 "gnumach-" version ".tar.gz")) (sha256 (base32 - "1s09256g2ny46idrn8frzs7r51la9ni45bmglmswlsmz9ii7dpi4"))))))) + "1bnw5vdbq91zjxklx23qvim40fb0yw1qdxhn9n37jdfypm6q3xir"))))))) (native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0)) (arguments (substitute-keyword-arguments (package-arguments gnumach-headers) From patchwork Sun Nov 24 07:55:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33825 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 9959B27BBEE; Sun, 24 Nov 2024 07:59:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 A5ACB27BBF0 for ; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VN-0000s9-9f; Sun, 24 Nov 2024 02:58:05 -0500 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 1tF7Up-0000SK-7J for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uo-0002Qi-Ry; Sun, 24 Nov 2024 02:57:30 -0500 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=zJbKGkWlYd1swF4O5NU/WcKrUZufd6Str9cF0iYKHiQ=; b=Sd/QnJLfRW1FcfJnCq9CsFgKcSBUocHiZ57OfzYFCBEVaH9sNrZhAV+jDXEr3YRz/Vl7IbC3W8vA5PYnaAn88QhY2PAFJKlGIJhBaJg0f7iPAO53nJCe6mwGMVRmj1Z4LY88fitpEfj56MOljfLuW/JjtTqjgaV4oQ+Y3w6Z17qM0F88i8LC9K/+HfjwoVtgH9X9MiUo/IC8NQvItwmuLQB11vlpB2xwM3YbQy+y/92XM6p3+7wTwyPyswlpjIlk+yfULz7CWBj/7m5TwyhS3NlqG0pIKxuP3+dxNtsgPqzF1ZLBfwBDTpwB7yX4IzA3kBsMbSY/EbqAe+cmhwegdg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Un-0004nQ-CM; Sun, 24 Nov 2024 02:57:29 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 44/58] gnu: commencement: mig-boot0: Update to 1.8+git20231217.. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:29 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503818233 (code B ref 74290); Sun, 24 Nov 2024 07:57:29 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:18 +0000 Received: from localhost ([127.0.0.1]:60866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jo-VI for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bB-Uf for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:45 -0500 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 1tF7Tz-0002GN-Nz; Sun, 24 Nov 2024 02:56:39 -0500 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=zJbKGkWlYd1swF4O5NU/WcKrUZufd6Str9cF0iYKHiQ=; b=PLb41dg0X1ifLdkPtyr0 t2XWtDZndClBjj3TAKvQD6JT104BhT1VFiMdaK8KSjYo5jsZsEKxqs2xgZNkI45XRdLMG6S1ZFpW3 zLljRudM4flh6o0xfI7ysiXUihUoOfmzqTjMMcH6+1jfxIh76FX1ZWOwQfZ9Ub0OPljeIHtFliXyD m1s9d+f1zkmYS5ke8zDInMTLG7SUveFNvwd3cRQGN0Fj3A4q4f4QvzZfshm+QU8M39fyeosOacEri 94MEwlbl7NlPk8Z12tU2RXqlle0qlVlXrlrrbe+phT3CdBdfKsu7MyBFajUo46G3B23iy/j8RO73R Pwxhw/v2wG/HCA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:07 +0100 Message-ID: <272cc3af194a8fecc855518ebb04912e85c0ac1a.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/commencement.scm (mig-boot0): Update to 1.8+git20231217. Change-Id: I591ff7cb84ac1e567d49f51eb40be19fa6b15f5b --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2f805b3e63..742ccbc63b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2670,7 +2670,7 @@ (define mig-boot0 (package (inherit mig) (name "mig-boot0") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (inherit (package-source mig)) @@ -2683,7 +2683,7 @@ (define mig-boot0 "mig-" version ".tar.gz")) (sha256 (base32 - "1l1vfm4wap5yxylv91wssgpy7fnq22wp3akgd5nv995kychfa9jy"))))))) + "18vz3ifrhhlvrdmlv70h63wl0kh5w8jcpsjx9yscsw9yazm1lzs7"))))))) (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0 gnumach-headers-boot0)) (inputs (list flex-boot0 gnumach-headers-boot0)) From patchwork Sun Nov 24 07:55:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33822 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 0B35227BBEA; Sun, 24 Nov 2024 07:59:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 5187727BBEB for ; Sun, 24 Nov 2024 07:59:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vz-0001gz-Qo; Sun, 24 Nov 2024 02:58:44 -0500 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 1tF7Up-0000SJ-0R for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uo-0002Q2-0N; Sun, 24 Nov 2024 02:57:30 -0500 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=BeOgD0UmX7EVnVKq7bSxcI53DT9PJfVxrIKTnsHKm+c=; b=U3FR7XbHhTCR6NMY/cBYITZxUPJrk/0Z9as0fOl8sYgIixavXYLDiXpZc7c0saf+clRS6o0nQth7BqJOopX3naveMH0PB/oQGFwbSATlosakjB37Ypi5a/0+TwSXR9w8I5dV+zll7WRdfOtxK/ysm0sjp4jTX3vBBTJNpBStbr7EEdg5WNJ1b6TBKUO7LrEnVKUKYM05q2WPyfWBjgwR0HOY1eAKgEyfOMJf2zI86klTjZDjmv/+IIfltAihbd05Y8C/nRgojmungJjVvcLrbjvRfvxZkUBqHvC0WPwA7DtJtO7sAuvj4oT3MAEL7Wk/OCfoAPOsB2kS/nnG5vU9mQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Un-0004nY-RU; Sun, 24 Nov 2024 02:57:29 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 45/58] gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:29 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503918245 (code B ref 74290); Sun, 24 Nov 2024 07:57:29 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:19 +0000 Received: from localhost ([127.0.0.1]:60870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uc-0004k3-FF for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004bI-1r for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -0500 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 1tF7U0-0002Ga-QS; Sun, 24 Nov 2024 02:56:40 -0500 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=BeOgD0UmX7EVnVKq7bSxcI53DT9PJfVxrIKTnsHKm+c=; b=VdJPfCMgcHLGvPihRsQO VeftCWTJuVKICw8sPJ/5KFYYtmjJxSVHi14EWGVQ2cemiZ2WKprY2Tev8y52oIV972vbUZnRCrbLI CBMCFilVub+4Eb+SDkz4DRcWzVeth61GnshViqRa8APsM1+iE43LoReuERfjY55NFebkcWAVQhDXT 86vF65Oc208PYsqOpNUoxO7EGAjpaxA4yF49Ta+cs7W/WwvvHL4+hUMbKV1hOwJWAEf4wU+Crp7Zk SfEJHuNjP/OlBovUwR5wVJ98gGqC88P51RsMsECR1q4GGYUrx/NviKN3CdzbQU8lbEe6me4xwm0R+ wpVDQuvkXK5pwQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:08 +0100 Message-ID: <8ea163ca02c34172cb1a3302abf665413f2941e2.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/commencement.scm (hurd-headers-boot0): Update to 0.9.git20240714. Change-Id: Ib3edaa3adb9cfe4cb8c5a3af83cb2701ee9dda1b --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 742ccbc63b..ad70bae501 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2699,7 +2699,7 @@ (define hurd-headers-boot0 (package (inherit hurd-headers) (name "hurd-headers-boot0") - (version "0.9.git20230520") + (version "0.9.git20240714") (source (origin (inherit (package-source hurd-headers)) @@ -2712,7 +2712,7 @@ (define hurd-headers-boot0 "hurd-v" version ".tar.gz")) (sha256 (base32 - "0ybmx7bhy21zv1if2hfdspn13zn68vki1na72sw2jj87gj8przna"))))))) + "0wcihffclwijjamx4cjbr8i92yg780538ipg2z208ahg96jjrmgq"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) From patchwork Sun Nov 24 07:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33837 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 B9E4B27BBEC; Sun, 24 Nov 2024 07:59:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 693F527BBE2 for ; Sun, 24 Nov 2024 07:59:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VI-0000kF-9I; Sun, 24 Nov 2024 02:58:00 -0500 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 1tF7Uo-0000SI-Vg for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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 1tF7Uo-0002QE-Hi; Sun, 24 Nov 2024 02:57:30 -0500 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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=SDv2FACryfbh+V1AVIKkw+lC34sLLFWrjhF+zGTG5YBNcQHdWUCQq6AYsxxM3yI2Elqh3eDhTc8exIhhpRpot+Q4ZswAp9xgFrVW8Ja2PIS4ZCiNwKxN2XpTRI+7Cd9Xo9Unt4xJj8x0/+aoweW8cQd4z5aVObGEqbIy0/68YgedjAY8QG/nxB0PC40HTyBkA9N9SnR7V+x4QXsc6MKXgiSk9+GAXQj4aUpjiJAxHRZTaHk323M2PNaFZxUrw4imlKQI3Zw9A01epih/gDkNXOPNC1VAJIzgtI4odUiwMPu71LrPlYbhVWu4y6RUzTqwWmf6MAEmu9H3hqO694tcvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uo-0004ni-Bn; Sun, 24 Nov 2024 02:57:30 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 46/58] gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:30 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503918259 (code B ref 74290); Sun, 24 Nov 2024 07:57:30 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:19 +0000 Received: from localhost ([127.0.0.1]:60872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kD-0j for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004bX-FA for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 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 1tF7U3-0002Hf-1p; Sun, 24 Nov 2024 02:56:43 -0500 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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=YdwBJ96Ulj5MS/REdVVE 7+YPn8Kdv7ejLEsZNNYcwoUroVX97o5V4M00SshhnLAFFHs5lW629qmBdlNBoPomquDPZuGGbiFeV qWa1/6G+41BUh86MxqSIUKNgffqe6C+jCGXICiHk90h4ubljVwcF/RnImDr3Wg+01mAuOI6EvjV4N Yw0Qncra78FwpaQ6g/ektrSrN2/dwudyjuBdDP2eYDzWwdQNpaLRuLe5qTg3Dry5UByeLfou91rcr NKFjczqBGNDt6ILFsxtMiup31RwKhB4P9vGhFRCMgaPPuldMd6HFD59BIc8UtoQrDurCnQ8BtYLVB fYvYZoj8M1WLMA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:09 +0100 Message-ID: <0f6acb8bd7ab8198cea709492c792c16c2d4f895.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/commencement.scm (libstdc++-boot0-gcc7): Change variable to... (make-libstdc++-boot0): ...this new procedure and update accordingly. (gcc-boot0): Update accordingly, and cater for x86_64-gnu. Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656 --- gnu/packages/commencement.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,9 @@ (define libstdc++-boot0 (inputs (%boot0-inputs)) (native-inputs '())))) -(define libstdc++-boot0-gcc7 +(define (make-libstdc++-boot0 gcc) ;; GCC >= 7 is needed by architectures which use C++-14 features. - (let ((lib (make-libstdc++ gcc-7))) + (let ((lib (make-libstdc++ gcc))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -2446,7 +2446,8 @@ (define gcc-boot0 ;; The libstdc++ that libcc1 links against. ("libstdc++" ,(match (%current-system) - ("riscv64-linux" libstdc++-boot0-gcc7) + ("riscv64-linux" (make-libstdc++-boot0 gcc-7)) + ("x86_64-gnu" (make-libstdc++-boot0 gcc-14)) (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether From patchwork Sun Nov 24 07:55:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33821 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 994ED27BBEC; Sun, 24 Nov 2024 07:59:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 4ECE127BBE9 for ; Sun, 24 Nov 2024 07:59:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7W4-0001qL-Uv; Sun, 24 Nov 2024 02:58:51 -0500 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 1tF7Uq-0000T4-Q6 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 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 1tF7Up-0002R3-7a for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; b=DixYFjLFXIOHHx+Q1AZ5gP5cXVqzy+AAQr/vf1/mBRQ1567pNcFHHx1kbt42oRcGFsEud5noD0qIvqFmk1cy05Vv1ohBkRPlU5LGMeRHQvYHQl9qxfstPNh9DkFn6+yKil5xQ8Nk8a1nw3wVY7FFlH5T57n2KC9LmWWAmBwZ9/zV5yonFtDeUczgJHWXTx9otwY393JeCdqSZKakW26ghJeAXiAtG8g0ANan/grR7dKjWzhPgNNnlXVXVFv8vIpKQFWOxmTGFW7buAeqjqpx8qABl07hoV+l2TsGCik3OTTOonC0w1fuSPnqC3xNzrKL6FRBAO5+P8GVrzw353iC1Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Up-0004o1-3X for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:31 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 47/58] gnu: gettext: Fix cross-build shebangs. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504018275 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000 Received: from localhost ([127.0.0.1]:60878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kS-Mc for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UA-0004bv-Cy for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:50 -0500 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 1tF7U5-0002Hy-75; Sun, 24 Nov 2024 02:56:45 -0500 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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; b=rl6BI5MjfmlKpOJuM2ak xH+fADZcdYIqlkbeO21ZXq5QJsm80Egx1rt0A1vtC0Hgy+5whpXsgdPNvSHauuT6XPsCqTx31lhZK IAJ2Y7RzbB0AxMF6MAOcZEkQ8Gq0VCDm0VpKnNdAs2xh4bgHLXKPo8WvnkfHuMr+VggF3QmxL/yOO 2KUMK+jKSqsdTa4V7QysLRFytAv65tpDlbZK/pwIpGTg+odTDEmSk0VZpiiyrrduqCAdOERxsIzph 4lnOq4xin31M08tqYpiZO6MPBJM1Y8un4oHe4qr4wBVNfIE4SnJLJF0b4E3G67/Z/bGv1kOZLvuwT xnrUnTeYesGzNw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:10 +0100 Message-ID: <4c0fa7e093727553b20a0e09e582f032667dd566.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 This fixes running autopoint from a cross-built gettext[-minimal]. * gnu/packages/gettext.scm (gettext-minimal): When cross-building, add stage "patch-cross-shebangs". Change-Id: I5029a3be0b5cee3c173de66d8f0b027b02c3bc47 --- gnu/packages/gettext.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index cabe4f3be9..7862c296bd 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Miguel -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2022, 2024 gemmaro ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> @@ -130,7 +130,19 @@ (define-public gettext-minimal ((" test-tls\\$\\(EXEEXT\\) ") " "))) '()) - #t))))) + #t)))) + #$@(if (%current-target-system) + #~((add-after 'install 'patch-cross-shebangs + (lambda _ + (let ((path (list (string-append #$bash-minimal "/bin")))) + (define (patch-cross-shebang file) + (patch-shebang file path)) + (with-directory-excursion + (string-append #$output "/bin") + (for-each + patch-cross-shebang + '("autopoint" "gettext.sh" "gettextize"))))))) + '())) ;; When tests fail, we want to know the details. #:make-flags #~'("VERBOSE=yes"))) From patchwork Sun Nov 24 07:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33829 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 8B7F927BBE2; Sun, 24 Nov 2024 07:59:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 89C7E27BBE9 for ; Sun, 24 Nov 2024 07:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7WF-0001zz-OA; Sun, 24 Nov 2024 02:59:00 -0500 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 1tF7Us-0000Uy-PI for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:36 -0500 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 1tF7Uq-0002Rl-MZ for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:33 -0500 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=csLNrX7KglYSn+zXoqxh8/j8zPva+/LTtAkKnxbU/3s=; b=d7VU60hcWXCziCx2+j1c6VIc149is3lupNS+ET7LOUpv8w5P+QHBQmOsG6L4k1gf7Wqum0ibZTg3354MIneGfU/B7bxE+DcsnF7CRQvb2hI4Oem7jjFKHGWqmKOFJ9662q+YAAsb7gEwvIpD3q2ZrPBDtdXjRXsXtnBINs47S19OjHd7HOzQqvd1t+dNT/2K+X4fuCAccF3kfrQqa/xakoN7p+0M6i6Zri3Kkz1w5jD2aXYorgYBMopD5LmS5opxxihAkZcj+T2fTe7MQNIRNfOF9LQQGThSlqwD8JF+UUFN0zC3rEcK0YWP+C6lkDV469QDjNBovph5y68vTV2r/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uq-0004oV-FT for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 48/58] gnu: Add gdb-15.2, with support for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:32 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504418337 (code B ref 74290); Sun, 24 Nov 2024 07:57:32 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:24 +0000 Received: from localhost ([127.0.0.1]:60889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uf-0004lH-M0 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UB-0004cS-MD for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:54 -0500 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 1tF7U6-0002I6-7E; Sun, 24 Nov 2024 02:56:46 -0500 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=csLNrX7KglYSn+zXoqxh8/j8zPva+/LTtAkKnxbU/3s=; b=hmPSxQ9Qx41mL3c5CxJb zCfoyUes3vei+EJR9UZwWdhL1NJqL6heDcVJYYZPqbtvqfLNRuEwedNQGL7gxBDZDwTXGmfxph70d fnp7vy4lSaXmtDOtqlTM4q4tW9eQVOpSZg1yd+jhk3F4zO+QOAiXSX0Lc2q7+Dl5udzkbzKVrqsFG qKbM9SJe2eMnaGU0gcPvy896YWoeziI5Dv4m7j54nbM5vqyxyfXhioKvJahXilIVmGH1HRpC4dEYz 1uV8leMyciojftTEBKrDAdLvGYGjKnygz6x+iTxbXv6rjzg8wNHVAGrj6loKUbobOzeiVV4UaT6P7 K2ArhSOv8+zTCg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:11 +0100 Message-ID: <332ac99487986c19265582f445e03f48968b2265.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/patches/gdb-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gdb.scm (gdb-15): Use it in new variable. (gdb-minmal-15): New variable. (gdb/pinned): When building for the 64bit Hurd, set #:configure-flags to "--enable-targets=i586-pc-gnu,x86_64-pc-gnu". Change-Id: I52d28092be6c415b8668bb5a77d41c87df841351 --- gnu/local.mk | 1 + gnu/packages/gdb.scm | 22 + gnu/packages/patches/gdb-hurd64.patch | 923 ++++++++++++++++++++++++++ 3 files changed, 946 insertions(+) create mode 100644 gnu/packages/patches/gdb-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3595c68800..08314ade22 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1372,6 +1372,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ + %D%/packages/patches/gdb-hurd64.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index bf46716047..af5ebde3f6 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -67,6 +67,9 @@ (define-public gdb/pinned #:out-of-source? #t #:modules `((srfi srfi-1) ,@%default-gnu-modules) + #:configure-flags (if (target-hurd64?) + #~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu") + #~'()) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -160,6 +163,19 @@ (define-public gdb-14 "0wkprsjyyh204fdjlkaz20k847l88i9y8m9zqsv15vcd3l3dhk9d")))) (properties '()))) +(define-public gdb-15 + (package + (inherit gdb-14) + (version "15.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (patches (search-patches "gdb-hurd64.patch")) + (sha256 + (base32 + "0k9i8mizg4hby020k53kqmc835pajh9c8d5klv5s1ddm6p6hqdc3")))))) + (define-public gdb ;; The "default" version. gdb-14) @@ -184,6 +200,12 @@ (define-public gdb-minimal (inputs (fold alist-delete (package-inputs gdb) '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) +(define-public gdb-minimal-15 + (package/inherit gdb-15 + (name "gdb-minimal") + (inputs (fold alist-delete (package-inputs gdb-15) + '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) + (define-public avr-gdb (package/inherit gdb-14 (name "avr-gdb") diff --git a/gnu/packages/patches/gdb-hurd64.patch b/gnu/packages/patches/gdb-hurd64.patch new file mode 100644 index 0000000000..50e44b3684 --- /dev/null +++ b/gnu/packages/patches/gdb-hurd64.patch @@ -0,0 +1,923 @@ +Upstream-status: Taken from bug-hurd + + . + +and gdb-patches + + + +mailing lists. + +From 6131a7a8951bc255d6c013de126c46b620434d2f Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 22:45:33 +0100 +Subject: [PATCH 1/2] Port GDB to Hurd x86_64. + +This port extends the existing i686 port to support x86_64 by trying to +reuse existing code whenever it makes sense. + +* gdb/amd64-gnu-tdep.c: Adds logic for handling signal frames and + position of amd64 registers in the different Hurd structs. + The signal code is very similar to i686, except the trampoline code + is adapted. +* gdb/config/i386/nm-i386gnu.h: renamed to gdb/config/i386/nm-x86-gnu.h + and adapt it for x86_64. +* gdb/config/i386/i386gnu.mn: renamed to gdb/config/i386/nm-x86-gnu.mn + and reuse it for x86_64. +* gdb/configure.host: recognize gnu64 as a host. +* gdb/configure.nat: recognize gnu64 host and update existing i386gnu to + reuse the new shared files. +* gdb/configure.tgt: recognize x86_64-*-gnu* triplet and use + amd64-gnu-tdep.c. +* gdb/i386-gnu-tdep.c: added i386_gnu_thread_state_reg_offset that is + copied from i386-gnu-nat.c. This makes it similar to amd64. +* gdb/i386-gnu-nat.c: rename it to x86-gnu-nat.c since we reuse this for + i386 and amd64. Updated REG_ADDR to use one of the structures. Added + VALID_REGISTER to make sure it's a register we can provide at this time + (not all of them are available in amd64). FLAGS_REGISTER is either rfl + or efl depending on the arch. Renamed functions and class from i386 to x86 + whenever they can be reused. + +Tested on Hurd x86_64 and i686. +--- + gdb/Makefile.in | 4 +- + gdb/amd64-gnu-tdep.c | 231 ++++++++++++++++++ + .../i386/{nm-i386gnu.h => nm-x86-gnu.h} | 7 + + gdb/config/i386/{i386gnu.mn => x86-gnu.mn} | 0 + gdb/configure.host | 1 + + gdb/configure.nat | 27 +- + gdb/configure.tgt | 6 +- + gdb/i386-gnu-tdep.c | 13 +- + gdb/{i386-gnu-nat.c => x86-gnu-nat.c} | 171 +++++++++---- + 9 files changed, 403 insertions(+), 57 deletions(-) + create mode 100644 gdb/amd64-gnu-tdep.c + rename gdb/config/i386/{nm-i386gnu.h => nm-x86-gnu.h} (83%) + rename gdb/config/i386/{i386gnu.mn => x86-gnu.mn} (100%) + rename gdb/{i386-gnu-nat.c => x86-gnu-nat.c} (68%) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 84bc54b303e..67a15e2cc68 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -737,6 +737,7 @@ ALL_64_TARGET_OBS = \ + amd64-darwin-tdep.o \ + amd64-dicos-tdep.o \ + amd64-fbsd-tdep.o \ ++ amd64-gnu-tdep.o \ + amd64-linux-tdep.o \ + amd64-netbsd-tdep.o \ + amd64-obsd-tdep.o \ +@@ -1688,6 +1689,7 @@ ALLDEPFILES = \ + amd64-dicos-tdep.c \ + amd64-fbsd-nat.c \ + amd64-fbsd-tdep.c \ ++ amd64-gnu-tdep.c \ + amd64-linux-nat.c \ + amd64-linux-tdep.c \ + amd64-nat.c \ +@@ -1743,7 +1745,6 @@ ALLDEPFILES = \ + i386-dicos-tdep.c \ + i386-fbsd-nat.c \ + i386-fbsd-tdep.c \ +- i386-gnu-nat.c \ + i386-gnu-tdep.c \ + i386-linux-nat.c \ + i386-linux-tdep.c \ +@@ -1872,6 +1873,7 @@ ALLDEPFILES = \ + vax-tdep.c \ + windows-nat.c \ + windows-tdep.c \ ++ x86-gnu-nat.c \ + x86-nat.c \ + x86-tdep.c \ + xcoffread.c \ +diff --git a/gdb/amd64-gnu-tdep.c b/gdb/amd64-gnu-tdep.c +new file mode 100644 +index 00000000000..435095e3359 +--- /dev/null ++++ b/gdb/amd64-gnu-tdep.c +@@ -0,0 +1,231 @@ ++/* Target-dependent code for the GNU Hurd. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include "defs.h" ++#include "extract-store-integer.h" ++#include "gdbcore.h" ++#include "osabi.h" ++#include "solib-svr4.h" ++ ++#include "amd64-tdep.h" ++#include "glibc-tdep.h" ++ ++/* Recognizing signal handler frames. */ ++ ++/* When the GNU/Hurd libc calls a signal handler, the return address points ++ inside the trampoline assembly snippet. ++ ++ If the trampoline function name can not be identified, we resort to reading ++ memory from the process in order to identify it. */ ++ ++static const gdb_byte gnu_sigtramp_code[] = ++{ ++/* rpc_wait_trampoline: */ ++ 0x48, 0xc7, 0xc0, 0xe7, 0xff, 0xff, 0xff, /* mov $-25,%rax */ ++ 0x0f, 0x05, /* syscall */ ++ 0x49, 0x89, 0x04, 0x24, /* mov %rax,(%r12) */ ++ 0x48, 0x89, 0xdc, /* mov %rbx,%rsp */ ++ ++/* trampoline: */ ++ 0x5f, /* pop %rdi */ ++ 0x5e, /* pop %rsi */ ++ 0x5a, /* pop %rdx */ ++ 0x48, 0x83, 0xc4, 0x08, /* add $0x8,%rsp */ ++ 0x41, 0xff, 0xd5, /* call *%r13 */ ++ ++/* RA HERE */ ++ 0x48, 0x8b, 0x7c, 0x24, 0x10, /* mov 0x10(%rsp),%rdi */ ++ 0xc3, /* ret */ ++ ++/* firewall: */ ++ 0xf4, /* hlt */ ++}; ++ ++#define GNU_SIGTRAMP_LEN (sizeof gnu_sigtramp_code) ++#define GNU_SIGTRAMP_TAIL 7 /* length of tail after RA */ ++ ++/* If THIS_FRAME is a sigtramp routine, return the address of the ++ start of the routine. Otherwise, return 0. */ ++ ++static CORE_ADDR ++amd64_gnu_sigtramp_start (frame_info_ptr this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ gdb_byte buf[GNU_SIGTRAMP_LEN]; ++ ++ if (!safe_frame_unwind_memory (this_frame, ++ pc + GNU_SIGTRAMP_TAIL - GNU_SIGTRAMP_LEN, ++ buf)) ++ return 0; ++ ++ if (memcmp (buf, gnu_sigtramp_code, GNU_SIGTRAMP_LEN) != 0) ++ return 0; ++ ++ return pc; ++} ++ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ ++ ++static int ++amd64_gnu_sigtramp_p (const frame_info_ptr &this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ const char *name; ++ ++ find_pc_partial_function (pc, &name, NULL, NULL); ++ ++ /* If we have a NAME, we can check for the trampoline function */ ++ if (name != NULL && strcmp (name, "trampoline") == 0) ++ return 1; ++ ++ return amd64_gnu_sigtramp_start (this_frame) != 0; ++} ++ ++/* Offset to sc_i386_thread_state in sigcontext, from . */ ++#define AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET 32 ++ ++/* Assuming THIS_FRAME is a Hurd sigtramp routine, return the ++ address of the associated sigcontext structure. */ ++ ++static CORE_ADDR ++amd64_gnu_sigcontext_addr (const frame_info_ptr &this_frame) ++{ ++ struct gdbarch *gdbarch = get_frame_arch (this_frame); ++ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); ++ CORE_ADDR pc; ++ CORE_ADDR sp; ++ gdb_byte buf[8]; ++ ++ get_frame_register (this_frame, AMD64_RSP_REGNUM, buf); ++ sp = extract_unsigned_integer (buf, 8, byte_order); ++ ++ pc = amd64_gnu_sigtramp_start (this_frame); ++ if (pc) ++ { ++ CORE_ADDR sigcontext_addr; ++ ++ /* The sigcontext structure address is passed as the third argument ++ * of the signal handler but %RDX is not saved across calls. Luckily, ++ * the structured is saved underneath the &__sigreturn and a dummy word ++ * to fill the slot for the address for __sigreturn to return to. ++ */ ++ read_memory (sp + 16, buf, 8); ++ sigcontext_addr = extract_unsigned_integer (buf, 8, byte_order); ++ return sigcontext_addr + AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET; ++ } ++ ++ error (_("Couldn't recognize signal trampoline.")); ++ return 0; ++} ++ ++/* Mapping between the general-purpose registers in `struct ++ sigcontext' format (starting at sc_i386_thread_state) ++ and GDB's register cache layout. */ ++ ++/* From . */ ++static int amd64_gnu_sc_reg_offset[] = ++{ ++ 15 * 8, /* %rax */ ++ 12 * 8, /* %rbx */ ++ 14 * 8, /* %rcx */ ++ 13 * 8, /* %rdx */ ++ 10 * 8, /* %rsi */ ++ 9 * 8, /* %rdi */ ++ 10 * 8, /* %rbp */ ++ 11 * 8, /* %rsp */ ++ 0 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++}; ++ ++/* From . */ ++static int amd64_gnu_gregset_reg_offset[] = ++{ ++ 10 * 8, /* %rax */ ++ 5 * 8, /* %rbx */ ++ 11 * 8, /* %rcx */ ++ 12 * 8, /* %rdx */ ++ 13 * 8, /* %rsi */ ++ 14 * 8, /* %rdi */ ++ 4 * 8, /* %rbp */ ++ 19 * 8, /* %rsp */ ++ 9 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++ -1, /* %ss */ ++ -1, /* %ds */ ++ -1, /* %es */ ++ -1, /* %fs */ ++ -1, /* %gs */ ++}; ++ ++static void ++amd64_gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) ++{ ++ i386_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ ++ amd64_init_abi (info, gdbarch, ++ amd64_target_description (X86_XSTATE_SSE_MASK, true)); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); ++ ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ tdep->gregset_reg_offset = amd64_gnu_gregset_reg_offset; ++ tdep->gregset_num_regs = ARRAY_SIZE (amd64_gnu_gregset_reg_offset); ++ tdep->sizeof_gregset = 21 * 8; /* sizeof (struct i386_thread_state); */ ++ ++ tdep->sigtramp_p = amd64_gnu_sigtramp_p; ++ tdep->sigcontext_addr = amd64_gnu_sigcontext_addr; ++ tdep->sc_reg_offset = amd64_gnu_sc_reg_offset; ++ tdep->sc_num_regs = ARRAY_SIZE (amd64_gnu_sc_reg_offset); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_solib_svr4_fetch_link_map_offsets ++ (gdbarch, svr4_lp64_fetch_link_map_offsets); ++} ++ ++void _initialize_amd64_gnu_tdep (); ++void ++_initialize_amd64_gnu_tdep () ++{ ++ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, ++ GDB_OSABI_HURD, amd64_gnu_init_abi); ++} +diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-x86-gnu.h +similarity index 83% +rename from gdb/config/i386/nm-i386gnu.h +rename to gdb/config/i386/nm-x86-gnu.h +index d2d5de83948..ed4d1729227 100644 +--- a/gdb/config/i386/nm-i386gnu.h ++++ b/gdb/config/i386/nm-x86-gnu.h +@@ -22,9 +22,16 @@ + /* Thread flavors used in re-setting the T bit. */ + #define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE + #define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT ++#ifdef __x86_64__ ++#define THREAD_STATE_SET_TRACED(state) \ ++ ((struct i386_thread_state *) (state))->rfl |= 0x100 ++#define THREAD_STATE_CLEAR_TRACED(state) \ ++ ((((struct i386_thread_state *) (state))->rfl &= ~0x100), 1) ++#else + #define THREAD_STATE_SET_TRACED(state) \ + ((struct i386_thread_state *) (state))->efl |= 0x100 + #define THREAD_STATE_CLEAR_TRACED(state) \ + ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1) ++#endif /* __x86_64__ */ + + #endif /* CONFIG_I386_NM_I386GNU_H */ +diff --git a/gdb/config/i386/i386gnu.mn b/gdb/config/i386/x86-gnu.mn +similarity index 100% +rename from gdb/config/i386/i386gnu.mn +rename to gdb/config/i386/x86-gnu.mn +diff --git a/gdb/configure.host b/gdb/configure.host +index da71675b201..999af8e59ae 100644 +--- a/gdb/configure.host ++++ b/gdb/configure.host +@@ -184,6 +184,7 @@ x86_64-*-mingw*) gdb_host=mingw64 + gdb_host_obs=mingw-hdep.o + ;; + x86_64-*-cygwin*) gdb_host=cygwin64 ;; ++x86_64-*-gnu*) gdb_host=gnu64 ;; + m32r*-*-linux*) gdb_host=linux ;; + + xtensa*-*-linux*) gdb_host=linux ;; +diff --git a/gdb/configure.nat b/gdb/configure.nat +index 8b98511cef7..00402f888a9 100644 +--- a/gdb/configure.nat ++++ b/gdb/configure.nat +@@ -211,23 +211,44 @@ case ${gdb_host} in + ;; + esac + ;; ++ gnu64) ++ case ${gdb_host_cpu} in ++ i386) ++ # Host: x86_64 running the GNU Hurd ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ ++ x86-nat.o nat/x86-dregs.o \ ++ amd64-nat.o fork-child.o \ ++ nat/fork-inferior.o \ ++ notify_S.o process_reply_S.o msg_reply_S.o \ ++ msg_U.o exc_request_U.o exc_request_S.o' ++ HAVE_NATIVE_GCORE_HOST=1 ++ ++ NAT_FILE='nm-x86-gnu.h' ++ MH_CFLAGS='-D_GNU_SOURCE' ++ ++ XM_CLIBS='-lshouldbeinlibc' ++ ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" ++ ;; ++ esac ++ ;; + i386gnu) + case ${gdb_host_cpu} in + i386) + # Host: Intel 386 running the GNU Hurd +- NATDEPFILES='i386-gnu-nat.o gnu-nat.o \ ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ + x86-nat.o nat/x86-dregs.o fork-child.o \ + nat/fork-inferior.o \ + notify_S.o process_reply_S.o msg_reply_S.o \ + msg_U.o exc_request_U.o exc_request_S.o' + HAVE_NATIVE_GCORE_HOST=1 + +- NAT_FILE='nm-i386gnu.h' ++ NAT_FILE='nm-x86-gnu.h' + MH_CFLAGS='-D_GNU_SOURCE' + + XM_CLIBS='-lshouldbeinlibc' + +- nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn" ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" + ;; + esac + ;; +diff --git a/gdb/configure.tgt b/gdb/configure.tgt +index 47a674201f9..df9e9917ad1 100644 +--- a/gdb/configure.tgt ++++ b/gdb/configure.tgt +@@ -328,7 +328,7 @@ i[34567]86-*-linux*) + ;; + i[34567]86-*-gnu*) + # Target: Intel 386 running the GNU Hurd +- gdb_target_obs="i386-gnu-tdep.o solib-svr4.o" ++ gdb_target_obs="i386-gnu-tdep.o glibc-tdep.o solib-svr4.o" + ;; + i[34567]86-*-cygwin*) + # Target: Intel 386 running win32 +@@ -744,6 +744,10 @@ x86_64-*-openbsd*) + x86_64-*-rtems*) + gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" + ;; ++x86_64-*-gnu*) ++ # Target: x86_64 running the GNU Hurd ++ gdb_target_obs="amd64-gnu-tdep.o glibc-tdep.o solib-svr4.o" ++ ;; + xtensa*-*-*linux*) + # Target: GNU/Linux Xtensa + gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" +diff --git a/gdb/i386-gnu-tdep.c b/gdb/i386-gnu-tdep.c +index 98e11518a91..5ffc1388ec0 100644 +--- a/gdb/i386-gnu-tdep.c ++++ b/gdb/i386-gnu-tdep.c +@@ -21,6 +21,7 @@ + #include "osabi.h" + #include "solib-svr4.h" + ++#include "glibc-tdep.h" + #include "i386-tdep.h" + + /* Recognizing signal handler frames. */ +@@ -72,8 +73,7 @@ i386_gnu_sigtramp_start (const frame_info_ptr &this_frame) + return pc; + } + +-/* Return whether THIS_FRAME corresponds to a GNU/Linux sigtramp +- routine. */ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ + + static int + i386_gnu_sigtramp_p (const frame_info_ptr &this_frame) +@@ -178,9 +178,18 @@ i386gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + /* GNU uses ELF. */ + i386_elf_init_abi (info, gdbarch); + ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); + ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ + tdep->gregset_reg_offset = i386gnu_gregset_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (i386gnu_gregset_reg_offset); + tdep->sizeof_gregset = 19 * 4; +diff --git a/gdb/i386-gnu-nat.c b/gdb/x86-gnu-nat.c +similarity index 68% +rename from gdb/i386-gnu-nat.c +rename to gdb/x86-gnu-nat.c +index 52d4a4b7cec..da3b7e923dd 100644 +--- a/gdb/i386-gnu-nat.c ++++ b/gdb/x86-gnu-nat.c +@@ -34,7 +34,13 @@ extern "C" + #include "floatformat.h" + #include "regcache.h" + ++ ++#ifdef __x86_64__ ++#include "amd64-tdep.h" ++#include "amd64-nat.h" ++#else + #include "i386-tdep.h" ++#endif + + #include "inf-child.h" + #include "i387-tdep.h" +@@ -42,21 +48,82 @@ extern "C" + /* Offset to the thread_state_t location where REG is stored. */ + #define REG_OFFSET(reg) offsetof (struct i386_thread_state, reg) + ++#ifdef __x86_64__ ++ + /* At REG_OFFSET[N] is the offset to the thread_state_t location where + the GDB register N is stored. */ +-static int reg_offset[] = ++static int amd64_gnu_thread_state_reg_offset[] = + { +- REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx), +- REG_OFFSET (uesp), REG_OFFSET (ebp), REG_OFFSET (esi), REG_OFFSET (edi), +- REG_OFFSET (eip), REG_OFFSET (efl), REG_OFFSET (cs), REG_OFFSET (ss), +- REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs) ++ REG_OFFSET (rax), /* %rax */ ++ REG_OFFSET (rbx), /* %rbx */ ++ REG_OFFSET (rcx), /* %rcx */ ++ REG_OFFSET (rdx), /* %rdx */ ++ REG_OFFSET (rsi), /* %rsi */ ++ REG_OFFSET (rdi), /* %rdi */ ++ REG_OFFSET (rbp), /* %rbp */ ++ REG_OFFSET (ursp), /* %rsp */ ++ REG_OFFSET (r8), /* %r8 ... */ ++ REG_OFFSET (r9), ++ REG_OFFSET (r10), ++ REG_OFFSET (r11), ++ REG_OFFSET (r12), ++ REG_OFFSET (r13), ++ REG_OFFSET (r14), ++ REG_OFFSET (r15), /* ... %r15 */ ++ REG_OFFSET (rip), /* %rip */ ++ REG_OFFSET (rfl), /* %rflags */ ++ REG_OFFSET (cs) /* %cs */ + }; + +-#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum]) ++static const int amd64_gnu_thread_state_num_regs = ++ ARRAY_SIZE (amd64_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + amd64_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < amd64_gnu_thread_state_num_regs) ++#define NUM_GREGS amd64_gnu_thread_state_num_regs ++#define FLAGS_REGISTER rfl ++ ++#else ++ ++/* At REG_OFFSET[N] is the offset to the thread_state_t location where ++ the GDB register N is stored. */ ++static int i386_gnu_thread_state_reg_offset[] = ++{ ++ REG_OFFSET (eax), /* %eax */ ++ REG_OFFSET (ecx), /* %ecx */ ++ REG_OFFSET (edx), /* %edx */ ++ REG_OFFSET (ebx), /* %ebx */ ++ REG_OFFSET (uesp), /* %esp */ ++ REG_OFFSET (ebp), /* %ebp */ ++ REG_OFFSET (esi), /* %esi */ ++ REG_OFFSET (edi), /* %edi */ ++ REG_OFFSET (eip), /* %eip */ ++ REG_OFFSET (efl), /* %efl */ ++ REG_OFFSET (cs), /* %cs */ ++ REG_OFFSET (ss), /* %ss */ ++ REG_OFFSET (ds), /* %ds */ ++ REG_OFFSET (es), /* %es */ ++ REG_OFFSET (fs), /* %fs */ ++ REG_OFFSET (gs) /* gs */ ++}; ++ ++static const int i386_gnu_thread_state_num_regs = ++ ARRAY_SIZE (i386_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + i386_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < i386_gnu_thread_state_num_regs) ++#define NUM_GREGS i386_gnu_thread_state_num_regs ++#define FLAGS_REGISTER efl ++ ++#endif /* __x86_64__ */ + + + +-/* The i386 GNU Hurd target. */ ++/* The x86 GNU Hurd target. */ + + #ifdef i386_DEBUG_STATE + using gnu_base_target = x86_nat_target; +@@ -64,13 +131,13 @@ using gnu_base_target = x86_nat_target; + using gnu_base_target = gnu_nat_target; + #endif + +-struct i386_gnu_nat_target final : public gnu_base_target ++struct x86_gnu_nat_target final : public gnu_base_target + { + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; + }; + +-static i386_gnu_nat_target the_i386_gnu_nat_target; ++static x86_gnu_nat_target the_x86_gnu_nat_target; + + /* Get the whole floating-point state of THREAD and record the values + of the corresponding (pseudo) registers. */ +@@ -105,7 +172,7 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread) + + /* Fetch register REGNO, or all regs if REGNO is -1. */ + void +-i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + ptid_t ptid = regcache->ptid (); +@@ -118,7 +185,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + error (_("Can't fetch registers from thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + +@@ -137,7 +204,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "fetching all register"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + regcache->raw_supply (i, REG_ADDR (state, i)); + thread->fetched_regs = ~0; + } +@@ -152,7 +219,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + } + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER(regno) || regno == -1) + { + proc_debug (thread, "fetching floating-point registers"); + +@@ -195,7 +262,7 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int regno) + + /* Store at least register REGNO, or all regs if REGNO == -1. */ + void +-i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + struct gdbarch *gdbarch = regcache->arch (); +@@ -209,7 +276,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + error (_("Couldn't store registers into thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + thread_state_data_t old_state; +@@ -230,14 +297,14 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + /* Save the T bit. We might try to restore the %eflags register + below, but changing the T bit would seriously confuse GDB. */ +- trace = ((struct i386_thread_state *)state)->efl & 0x100; ++ trace = ((struct i386_thread_state *)state)->FLAGS_REGISTER & 0x100; + + if (!was_aborted && was_valid) + /* See which registers have changed after aborting the thread. */ + { + int check_regno; + +- for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++) ++ for (check_regno = 0; check_regno < NUM_GREGS; check_regno++) + if ((thread->fetched_regs & (1 << check_regno)) + && memcpy (REG_ADDR (&old_state, check_regno), + REG_ADDR (state, check_regno), +@@ -262,7 +329,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "storing all registers"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + if (REG_VALID == regcache->get_register_status (i)) + regcache->raw_collect (i, REG_ADDR (state, i)); + } +@@ -276,11 +343,11 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + } + + /* Restore the T bit. */ +- ((struct i386_thread_state *)state)->efl &= ~0x100; +- ((struct i386_thread_state *)state)->efl |= trace; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER &= ~0x100; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER |= trace; + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER (regno) || regno == -1) + { + proc_debug (thread, "storing floating-point registers"); + +@@ -295,7 +362,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + /* Get debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + { + mach_msg_type_number_t count = i386_DEBUG_STATE_COUNT; + kern_return_t err; +@@ -310,7 +377,7 @@ i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + /* Set debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + { + kern_return_t err; + +@@ -324,23 +391,23 @@ i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + /* Set DR_CONTROL in THREAD. */ + + static void +-i386_gnu_dr_set_control_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_control_one (struct proc *thread, void *arg) + { + unsigned long *control = (unsigned long *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[DR_CONTROL] = *control; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set DR_CONTROL to CONTROL in all threads. */ + + static void +-i386_gnu_dr_set_control (unsigned long control) ++x86_gnu_dr_set_control (unsigned long control) + { + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_control_one, &control); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_control_one, &control); + } + + /* Parameters to set a debugging address. */ +@@ -354,20 +421,20 @@ struct reg_addr + /* Set address REGNUM (zero based) to ADDR in THREAD. */ + + static void +-i386_gnu_dr_set_addr_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_addr_one (struct proc *thread, void *arg) + { + struct reg_addr *reg_addr = (struct reg_addr *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[reg_addr->regnum] = reg_addr->addr; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set address REGNUM (zero based) to ADDR in all threads. */ + + static void +-i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) ++x86_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + { + struct reg_addr reg_addr; + +@@ -377,13 +444,13 @@ i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + reg_addr.addr = addr; + + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_addr_one, ®_addr); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_addr_one, ®_addr); + } + + /* Get debug register REGNUM value from only the one LWP of PTID. */ + + static unsigned long +-i386_gnu_dr_get_reg (ptid_t ptid, int regnum) ++x86_gnu_dr_get_reg (ptid_t ptid, int regnum) + { + struct i386_debug_state regs; + struct proc *thread; +@@ -392,7 +459,7 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + inf_update_procs (gnu_current_inf); + + thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ()); +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + + return regs.dr[regnum]; + } +@@ -400,46 +467,50 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + /* Return the inferior's debug register REGNUM. */ + + static CORE_ADDR +-i386_gnu_dr_get_addr (int regnum) ++x86_gnu_dr_get_addr (int regnum) + { + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + +- return i386_gnu_dr_get_reg (inferior_ptid, regnum); ++ return x86_gnu_dr_get_reg (inferior_ptid, regnum); + } + + /* Get DR_STATUS from only the one thread of INFERIOR_PTID. */ + + static unsigned long +-i386_gnu_dr_get_status (void) ++x86_gnu_dr_get_status (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_STATUS); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_STATUS); + } + + /* Return the inferior's DR7 debug control register. */ + + static unsigned long +-i386_gnu_dr_get_control (void) ++x86_gnu_dr_get_control (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); + } + #endif /* i386_DEBUG_STATE */ + +-void _initialize_i386gnu_nat (); ++void _initialize_x86_gnu_nat (); + void +-_initialize_i386gnu_nat () ++_initialize_x86_gnu_nat () + { + #ifdef i386_DEBUG_STATE +- x86_dr_low.set_control = i386_gnu_dr_set_control; ++ x86_dr_low.set_control = x86_gnu_dr_set_control; + gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT); +- x86_dr_low.set_addr = i386_gnu_dr_set_addr; +- x86_dr_low.get_addr = i386_gnu_dr_get_addr; +- x86_dr_low.get_status = i386_gnu_dr_get_status; +- x86_dr_low.get_control = i386_gnu_dr_get_control; ++ x86_dr_low.set_addr = x86_gnu_dr_set_addr; ++ x86_dr_low.get_addr = x86_gnu_dr_get_addr; ++ x86_dr_low.get_status = x86_gnu_dr_get_status; ++ x86_dr_low.get_control = x86_gnu_dr_get_control; ++#ifdef __x86_64__ ++ x86_set_debug_register_length (8); ++#else + x86_set_debug_register_length (4); ++#endif + #endif /* i386_DEBUG_STATE */ + +- gnu_target = &the_i386_gnu_nat_target; ++ gnu_target = &the_x86_gnu_nat_target; + + /* Register the target. */ +- add_inf_child_target (&the_i386_gnu_nat_target); ++ add_inf_child_target (&the_x86_gnu_nat_target); + } +-- +2.46.0 + +From 7cfe6f639e601d6cca567342360ecbd3cdca128c Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 23:05:06 +0100 +Subject: [PATCH 2/2] Hurd: do not include defs.h when compiling MiG stubs + since they are compiled as C files + +Otherwise, GDB will fail to compile for Hurd. +--- + gdb/Makefile.in | 3 ++- + gdb/config/i386/x86-gnu.mn | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 67a15e2cc68..d847a8bad72 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -603,11 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) + # your system doesn't have fcntl.h in /usr/include (which is where it + # should be according to Posix). + DEFS = @DEFS@ ++GDB_INCLUDED_HEADER = -include $(srcdir)/defs.h + GDB_CFLAGS = \ + -I. \ + -I$(srcdir) \ + -I$(srcdir)/config \ +- -include $(srcdir)/defs.h \ ++ $(GDB_INCLUDED_HEADER) \ + -DLOCALEDIR="\"$(localedir)\"" \ + $(DEFS) + +diff --git a/gdb/config/i386/x86-gnu.mn b/gdb/config/i386/x86-gnu.mn +index b7414e3bcb4..24c58b02e98 100644 +--- a/gdb/config/i386/x86-gnu.mn ++++ b/gdb/config/i386/x86-gnu.mn +@@ -21,7 +21,9 @@ MIGCOM = $(MIG) -cc cat - /dev/null + | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h + + # MIG stubs are not yet ready for C++ compilation. +-%_S.o %_U.o : COMPILE.post += -x c -include gnu-nat-mig.h ++%_S.o %_U.o : COMPILE.post += -x c ++# Do not include defs.h since it requires C++. Rather include our own gnu-nat-mig.h ++%_S.o %_U.o : GDB_INCLUDED_HEADER = -include gnu-nat-mig.h + + NAT_GENERATED_FILES = notify_S.h notify_S.c \ + process_reply_S.h process_reply_S.c \ +-- +2.46.0 + From patchwork Sun Nov 24 07:55:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33831 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 C8E5627BBE2; Sun, 24 Nov 2024 07:59:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 5EAD627BBEB for ; Sun, 24 Nov 2024 07:59:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VN-0000sL-B5; Sun, 24 Nov 2024 02:58:05 -0500 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 1tF7Uq-0000T6-Q7 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 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 1tF7Up-0002RO-MP; Sun, 24 Nov 2024 02:57:32 -0500 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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=Ln47Ngd23mrH009mkRwf4mx+BLslOYl4oxvUu5gSqcHERGkxuTrB3+59YrXZ1hQmvXzdq91h5n6vk93XdAa7lizGH/+C17vrBhcrQbr8By1ddT/KBjyRHfqyb39bv3uKowcfnXOYLYaN935ubakheftXO+WOZsD3e0yv7jqclp5MHHK1ExBlkana/6Wj1zH9RA0JgwW6Ace52oLjKYIZZmEy9MYwHfq211So2A4uyZgbXFShsSQGowWXFMoaxjf+Aj16zWnqaiDy/5nF0zSzX6CuZHxHXMOEy04/vceZ7Pz5jUbh8XU2MWhly2RFT+l0fEhybor7xDkK3osQgxXFPg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Up-0004o9-Gn; Sun, 24 Nov 2024 02:57:31 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 49/58] gnu: bootstrap: %bootstrap-glibc: Also fix libm.so. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504018288 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000 Received: from localhost ([127.0.0.1]:60882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004ki-8X for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UC-0004ci-M2 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:53 -0500 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 1tF7U7-0002IM-Fs; Sun, 24 Nov 2024 02:56:47 -0500 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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=iOmJaO2+fZ4oFUVnOIin b6I9y+vjyISfcBJTLJTDZsDlpEQX3vY5LrI5R1umGCm8wFJ6fg4wOz9TVs3mJUEoyoHB3qOi/gRZI dlaGFXKPDys1Zb6NTz+zASHjzzWdtMCRRmbGnAdwczvbmXGeIUWGxS+Yiyw2QkLzckOjSN1Vk501Q ssZ1vkpmY0gPhlkpK6ZAG/VxTcWDXHIAMfaa+hadkGrQM0UaRe4bfzAOhQZaJJil8KIBdG/RkZvcd lxFPfYqFWq52Fgkr/gnADm8KjfdFUqo44znmBgpZzdI34ATbOYjkdqWv741olZX1IlIlLuXtp7dH6 DA4qOZgnCAXS/w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:12 +0100 Message-ID: <4d1ee77ec4b095207612b6c62baf0d7396d2f3f8.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 On the 64bit Hurd, glibc-2.39's libm.so is also a linker script. This fixes having it refer to /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libm.so.6 /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libmvec.so.1 * gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When building for the 64bit Hurd, also substitute libm.so linker script. Update the regexp to also cater for libh[urduser] and libm[achuser]. Change-Id: I878e63d18f1012b6e186e90eb68cb97bec5ae94c --- gnu/packages/bootstrap.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 8027918323..a6cdda2122 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -774,12 +774,12 @@ (define %bootstrap-glibc "/binaries.tar")) (chmod "lib" #o755) - ;; Patch libc.so so it refers to the right path. - (substitute* "lib/libc.so" - (("/[^ ]+/lib/(libc|ld)" _ prefix) - (string-append out "/lib/" prefix))) - - #t)))))) + ;; Patch linker scripts so they refer to the right file-names. + (substitute* ,(if (target-hurd64?) + ''("lib/libc.so" "lib/libm.so") + "lib/libc.so") + (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) + (string-append out "/lib/" prefix))))))))) (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) From patchwork Sun Nov 24 07:55:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33802 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 9CA0227BBEB; Sun, 24 Nov 2024 07:58:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 3985027BBE2 for ; Sun, 24 Nov 2024 07:58:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VJ-0000n4-SN; Sun, 24 Nov 2024 02:58:01 -0500 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 1tF7Uq-0000T5-Q5 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 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 1tF7Uq-0002RT-3H for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -0500 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=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; b=ZPT1pgZFDqIbpkjFcNxDFST86MAprZS08/EhUd35asQG4GieGq2NHkVBT/7GY+7QaPs7+1iL0oowPZE30fvzbkbLdE06XFIE1peiYMa842OdwEvM4EiL3ZPjq2zZCIXaSiz8Mtllx+6Uq8dBhm2bWpGsoFu+ox8ZF85HYYZopzGRASAcOXpOqpHgsx0fuc7usAwvZ2aotAFOCulQNBmxIxFL1A/8BES+MFXhZFoz2j4zCJxlzCI+8LzthSVVMOkOo025lotmYznNAkyAbELsOCV2GYkoUKU5vrFVArrbnGUWT2BJoUEAzkfP0y1aQFD0BBLG8EYgI/gFfRZKW26Oqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Up-0004oM-Un for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:31 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 50/58] system: examples: Add bare-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504118305 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:21 +0000 Received: from localhost ([127.0.0.1]:60886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004l1-Rz for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UD-0004cy-JY for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:54 -0500 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 1tF7U8-0002IV-9T; Sun, 24 Nov 2024 02:56:48 -0500 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=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; b=HYnQKkpyiAyhFwfEAhEa WqU5jhDgd2gp4JtI9izI7fxXWREC/HvLbxpCxD+QCIj3SPDi+M7aJ5h321cixNHT/62givI0QJCvn I3pC0c6EbGD51fHNjGQHJccMwqgrPaU0WaguImOd5JeWDrVMEZk7tIwVgSGhT67UiJYMETgXgqHSq x4lVD/DP9OKUlZHtbNg5ODMjt2z672boygkgs38FtB7oon7XvhezluKx2d0xnBvZLyLSaaYi0a3Wr 0SZX576OmPM0Hy5/gQTHcaUxSiGJQLDVxj2HnZBVs1MGGR4534BP5wFa0hq8EXagQBqVUF1T6bOB/ xcx3Ziz79LZwIw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:13 +0100 Message-ID: <5dd18b57a31588447d97aa36a286cc0eb8835366.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/system/examples/bare-hurd.tmpl: Update comments. * gnu/system/examples/bare-hurd64.tmpl: New file. Change-Id: I8d26afd19afaa8fb3558948b50b0efdc0f83f29c --- gnu/system/examples/bare-hurd.tmpl | 21 +++++---- gnu/system/examples/bare-hurd64.tmpl | 70 ++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 gnu/system/examples/bare-hurd64.tmpl diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 68c6d3c166..9bfa776769 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -3,23 +3,26 @@ ;; This is an operating system configuration template ;; for a "bare bones" QEMU setup, with no X11 display server. -;; To build a disk image for a virtual machine, do +;; To build a disk image for a virtual machine, do: ;; -;; ./pre-inst-env guix system image --image-type=hurd-raw \ +;; ./pre-inst-env guix system image --image-type=hurd-qcow2 \ ;; gnu/system/examples/bare-hurd.tmpl ;; -;; You may run it like so +;; You may run it like so: ;; -;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ -;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ -;; -snapshot -hda +;; guix shell qemu -- qemu-system-i386 -m 2048 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --snapshot +;; --hda /gnu/store/...-disk-image ;; -;; and use it like +;; and use it like: ;; ;; ssh -p 10022 root@localhost ;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' ;; -;; or even (if you use --image-size=3G) +;; or even, if you build the image with at least --image-size=3G: ;; ;; guix build hello @@ -34,7 +37,7 @@ (bootloader grub-minimal-bootloader) (targets '("/dev/sdX")))) (file-systems (cons (file-system - (device (file-system-label "my-root")) + (device (file-system-label "hurd")) (mount-point "/") (type "ext2")) %base-file-systems)) diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl new file mode 100644 index 0000000000..89811e458a --- /dev/null +++ b/gnu/system/examples/bare-hurd64.tmpl @@ -0,0 +1,70 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" QEMU setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do: +;; +;; ./pre-inst-env guix system image --image-type=hurd64-qcow2 \ +;; gnu/system/examples/bare-hurd64.tmpl +;; +;; You may run it like so: +;; +;; guix shell qemu@7 -- qemu-system-x86_64 -m 2048 \ +;; --machine q35 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --snapshot +;; --hda /gnu/store/...-disk-image +;; +;; and use it like: +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even, if you build the image with at least --image-size=3G: +;; +;; guix build hello + +(use-modules (gnu) (gnu system hurd) (guix utils)) +(use-service-modules ssh) +(use-package-modules ssh) + +(define %hurd64-os + (operating-system + (inherit %hurd64-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")))) + (kernel-arguments '("noide")) ;use rumpdisk + (file-systems (cons (file-system + (device (file-system-label "hurd")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu64") + (timezone "Europe/Amsterdam") + (users (cons (user-account + (name "guix") + (comment "Anonymous Hurd Hacker") + (group "users") + (supplementary-groups '("wheel"))) + %base-user-accounts)) + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + ;; For installing on a real (non-QEMU) machine, use: + ;; (static-networking-service-type + ;; (list %loopback-static-networking + ;; (static-networking + ;; ...))) + ;; %base-services/hurd + %base-services+qemu-networking/hurd)))) + +%hurd64-os From patchwork Sun Nov 24 07:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33830 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 AF66327BBEA; Sun, 24 Nov 2024 07:59:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 215DB27BBE2 for ; Sun, 24 Nov 2024 07:59:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VI-0000kS-Ad; Sun, 24 Nov 2024 02:58:00 -0500 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 1tF7Us-0000V0-RQ for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:36 -0500 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 1tF7Ur-0002Rv-4k for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=FJR9EWGP6Yb0VtI9IF9Oadkqdb/G6n5Oz4txTILQ3knARR95gNV+5pUB722E7hTUcMwUVW+DEAMZTjIMw4O7cWZZKNCoH2zjO+nQAf7gpFk/0qxXCn9UzdIFY3s4jkL6bTokfAcSMOn2ECPNjGD+PRR3UUhvuQpZS/sj6B5sAQYdmK6E0aBY36iLe5E8R/H9VMMFYEZoUY/8Ya5zWqKMYiloVyQhsyDhA38nmKnWkJhWgsTY8OusgSIAA8YVwQtalU14hSeyN+Qs/y94ROBcnBMjCQB/sfNUo5Tditu5lr3+uHs8V8pYJ/BILdSyqPpI+p4bFRmJlduKXq1+Fmz5YA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ur-0004oc-0Z for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:33 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 51/58] system: examples: Add devel-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:32 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504518354 (code B ref 74290); Sun, 24 Nov 2024 07:57:32 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:25 +0000 Received: from localhost ([127.0.0.1]:60894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ui-0004li-9E for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UE-0004dC-Cy for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:55 -0500 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 1tF7U9-0002Ic-6i; Sun, 24 Nov 2024 02:56:49 -0500 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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=kZ3DVapJ/nMJsqzkWbnv 9eoygZpYwolsjXr/zA++TL6eO9/cfLL1haQB3Pkjzt3h0rGdsRL33XzLsLPi+FXm0yMU52i/bP9iV 0gw8r+Chhlu9CXbYaMPKe3oq1LraFqSZyOy2nkQkjHXOXncXQ1tAF1vNoEGRw94+Tn7tu0X3kP4a/ EDL5UzIIumLBoknyhFt1AuHw+ICHmsMCbjaimoqZPU5HIgNUzazuQ8geube7R/vwL1VF2HsNH57lG o906HAI4UB1wwafKKKQgOVZNS/MFS1L5B/UXUVzZ7KPo5rj7qJckCmrSiYHekappwzMpraqyN+wiD 1P0BKZek/wNMsg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.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 This also updates comments and removes the comment about a very old `bootstrap-profile' hack. * gnu/system/examples/devel-hurd.tmpl (hurd-packages): New variable (%hurd-devel-os): Use it. * gnu/system/examples/devel-hurd64.tmpl: New file. Change-Id: I54b6b0843f0dd635d89cca483ae43d23b20d21e8 --- gnu/system/examples/devel-hurd.tmpl | 70 +++++++++++---------------- gnu/system/examples/devel-hurd64.tmpl | 65 +++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 42 deletions(-) create mode 100644 gnu/system/examples/devel-hurd64.tmpl diff --git a/gnu/system/examples/devel-hurd.tmpl b/gnu/system/examples/devel-hurd.tmpl index 3dca0706d1..066bdfe9d8 100644 --- a/gnu/system/examples/devel-hurd.tmpl +++ b/gnu/system/examples/devel-hurd.tmpl @@ -3,7 +3,7 @@ ;; This is an operating system configuration template for a "bare bones ;; development" setup, with no X11 display server. -;; To build a disk image for a virtual machine, do +;; To build a disk image for a virtual machine, do something like: ;; ;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ ;; --no-offload gnu/system/examples/devel-hurd.tmpl @@ -11,41 +11,38 @@ ;; You may run it like so ;; ;; cp /gnu/store/.../disk-image devel-hurd.img -;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 4096 \ -;; -device rtl8139,netdev=net0 \ -;; -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ -;; -hda devel-hurd.img -;; -;; and use it like +;; guix shell qemu -- qemu-system-i386 -m 4096 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img ;; ;; ssh -p 10022 root@localhost ;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' ;; -;; or even (if you use --image-size=3G) +;; or even: ;; ;; guix build hello ;; -;; Building Guix, do something like: +;; For Guix hacking, do something like: ;; -;; GUIX_PROFILE=/run/current-system/bootstrap-profile -;; source $GUIX_PROFILE/etc/profile +;; guix shell --boostrap -D guix ;; mkdir -p ~/src/guix ;; cd src/guix ;; git clone https://git.savannah.gnu.org/git/guix.git master ;; cd master ;; ./bootstrap -;; ./configure --with-courage +;; ./configure ;; make +(include "bare-hurd.tmpl") + (use-modules (srfi srfi-1) (ice-9 match) - (gnu) (gnu system hurd) - (gnu system locale) (guix packages) - (guix store) - (guix utils)) -(use-service-modules ssh virtualization) + (guix store)) + (use-package-modules base compression file gawk gdb hurd less m4 package-management ssh version-control) @@ -64,23 +61,23 @@ ;; These are not essential and do not build yet. '("graphviz" "guile-avahi" "po4a")))) +(define hurd-packages + (filter-map input->package + (fold alist-delete (package-direct-inputs hurd) + ;; These are not essential, rumpkernel is very big. + '("dde-sources" "parted" "rumpkernel" "util-linux" + "texinfo")))) + (define %hurd-devel-os (operating-system - (inherit %hurd-vm-operating-system) - (host-name "guixydevel") + (inherit %hurd-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) (timezone "Europe/Berlin") - (file-systems (cons (file-system - (device (file-system-label "hurd")) - (mount-point "/") - (type "ext2")) - %base-file-systems)) (swap-devices (list (swap-space (target "/swapfile")))) - (users (cons (user-account - (name "guix") - (group "users") - (supplementary-groups '("wheel"))) - %base-user-accounts)) (packages (cons* gdb-minimal git-minimal @@ -89,18 +86,7 @@ openssh-sans-x (append guix-packages - %base-packages/hurd))) - (services (cons* - (modify-services (operating-system-user-services - %hurd-vm-operating-system) - (openssh-service-type - config => - ;; Set wide open - (openssh-configuration - (openssh openssh-sans-x) - (port-number 2222) - (permit-root-login #t) - (allow-empty-passwords? #t) - (password-authentication? #t)))))))) + hurd-packages + %base-packages/hurd))))) %hurd-devel-os diff --git a/gnu/system/examples/devel-hurd64.tmpl b/gnu/system/examples/devel-hurd64.tmpl new file mode 100644 index 0000000000..146a35adcf --- /dev/null +++ b/gnu/system/examples/devel-hurd64.tmpl @@ -0,0 +1,65 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" QEMU setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do: +;; +;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ +;; --no-offload gnu/system/examples/devel-hurd64.tmpl +;; +;; You may run it like so: +;; +;; cp /gnu/store/.../disk-image devel-hurd.img +;; guix shell qemu@7 -- qemu-system-x86_64 -m 4096 \ +;; --machine q35 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img +;; +;; and use it like: +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even: +;; +;; guix build hello +;; +;; For Guix hacking, do something like: +;; +;; guix shell --boostrap -D guix +;; mkdir -p ~/src/guix +;; cd src/guix +;; git clone git clone git://git.savannah.gnu.org/guix +;; cd master +;; ./bootstrap +;; ./configure +;; make + +(include "devel-hurd.tmpl") +(include "bare-hurd64.tmpl") + +(define %hurd64-devel-os + (operating-system + (inherit %hurd64-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) + (timezone "Europe/Berlin") + (swap-devices (list (swap-space + (target "/swapfile")))) + (packages (cons* + gdb-minimal-15 + git-minimal + gnu-make + m4 + openssh-sans-x + (append + guix-packages + hurd-packages + %base-packages/hurd))))) + +%hurd64-devel-os From patchwork Sun Nov 24 07:55:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33839 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 E1E3A27BBE9; Sun, 24 Nov 2024 07:59:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 0ACE027BBE9 for ; Sun, 24 Nov 2024 07:59:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7WV-0002LL-5M; Sun, 24 Nov 2024 02:59:15 -0500 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 1tF7V3-0000Yu-Nf for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:47 -0500 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 1tF7Uv-0002Sw-4h; Sun, 24 Nov 2024 02:57:42 -0500 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=nIPQ9KKvElj9RO8ubX0wnllGEGxd+ijB69ou0YJogJw=; b=XEOL9jTAii3TFaSmOqGYbV+MniWv4CHOJAfdyBfwNAhSmi7AdWbhKydZni3KEhIU0jOGknyyGKXCyH9j+QIhtAlRXeaONKtuSZ8tn3epinqif8xa5xLxovN5ozYdwUBSPZqrWjv4ulChk0jurcBrbyIoIdnEcB/BzF0BMBvuW0CIYxKFAdhgsU99vl+1jNcFmH8OpIo10DraOwPusTKnL3gSc3hAEZ6pCN4vO9EmtlqjOYxYt2suJfUMMduN7RgkJQLDpWQupwKSVhaJ154uq2Zs/r7Q6C1gBUFIt9eM3Uk7EJ+jRtIJyyEX/7bj7xsUjjqZ0b5z1IFLQscGB1AqWw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ur-0004ok-E3; Sun, 24 Nov 2024 02:57:33 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 52/58] gnu: Use gcc-14, gcc-toolchain-14 on the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@cbaines.net, efraim@flashner.co.il, ekaitz@elenq.tech, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:33 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Christopher Baines , Efraim Flashner , Ekaitz Zarraga , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , Efraim Flashner , Ekaitz Zarraga , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504518367 (code B ref 74290); Sun, 24 Nov 2024 07:57:33 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:25 +0000 Received: from localhost ([127.0.0.1]:60897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uj-0004ly-6m for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UF-0004dK-9K for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:55 -0500 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 1tF7UA-0002Ij-3D; Sun, 24 Nov 2024 02:56:50 -0500 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=nIPQ9KKvElj9RO8ubX0wnllGEGxd+ijB69ou0YJogJw=; b=KigKCP2EUub+87YfejfD 6+qYYpYx8+ob1zJ42BMNzWA9ZVRyqFxQ/hVp/8TKttRD8+FmA7HF07kedo/YfyCMTrWG6acHWcYKy QtTHIdNw9ZzTFP3NWeuKCk2L4MRdogNMwx5PqffdYIqrAjwbwsaXuQqd++YtG+0lq1g3XjbWJG3wU ZC86M8x86FATqnI2k8mjvEg9RLn1NmJGTsCaZYBKYaahGSvpbJ5zndz504/6Ji1zDfjDvREJsTE5W O64hBe/cupVqM841F0E7b3lI4kGOzi7PQq4xJW2emLriDu4iZ6U3sO40TsU4TXR6yZ+LkFw3mMhTe 6o3IuSjSyiRPFg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:15 +0100 Message-ID: <55654c05fe45127e85fead81e90c0516c760d93a.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 This enables building packages in a 64bit childhurd. It will not enable offloading to a childhurd. * guix/utils.scm (host-hurd?, host-x86-64, host-hurd64?): New procedures. * gnu/packages/commencement.scm (gcc-toolchain): Use them to determine if the host is a 64bit Hurd, and use gcc-toolchain-14. * gnu/packages/gcc.scm (gcc): Likewise, to use gcc-14. Change-Id: I55e43fdc61e3ea5fc13065fc7ca854b951c94930 --- gnu/packages/commencement.scm | 4 +++- gnu/packages/gcc.scm | 5 ++++- guix/utils.scm | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a14de3002f..3f11bb3384 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 ;; The default GCC (define-public gcc-toolchain - gcc-toolchain-11) + (if (host-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e437bf5826..6247919fec 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -858,7 +858,10 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define-public gcc + (if (host-hurd64?) + gcc-14 + gcc-11)) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index e100c03365..537d0490e0 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -96,6 +96,9 @@ (define-module (guix utils) system-hurd? target-hurd64? system-hurd64? + host-hurd? + host-hurd64? + host-x86-64? target-mingw? target-x86-32? target-x86-64? @@ -729,6 +732,22 @@ (define* (system-hurd64?) (and (system-hurd?) (target-64bit? (%current-system)))) +(define (host-hurd?) + "Are we running on a Hurd system? This is almost never the right function, +use target-hurd? or system-hurd? instead." + (equal? (utsname:sysname (uname)) "GNU")) + +(define (host-x86-64?) + "Are we running on a x86_64 system? This is almost never the right +function, use target-x86-64? or system-x86-64? instead." + (equal? (utsname:machine (uname)) "x86_64")) + +(define (host-hurd64?) + "Are we running on a 64bit Hurd? This is almost never the right +function, use target-hurd64? or system-hurd64? instead." + (and (host-hurd?) + (host-x86-64?))) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target From patchwork Sun Nov 24 07:55:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33811 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 3BF0A27BBE9; Sun, 24 Nov 2024 07:58:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 A8B3A27BBEB for ; Sun, 24 Nov 2024 07:58:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vc-000107-Bo; Sun, 24 Nov 2024 02:58:21 -0500 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 1tF7Uu-0000Ve-MV for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:37 -0500 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 1tF7Ut-0002Se-0s; Sun, 24 Nov 2024 02:57:36 -0500 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=PrN9Kk4W1Jf/U7iXJ0r18w4mwJp1ou3k1AyIvUEhUAE=; b=I/4yARpQlGjEyO8tyLYKsHF9jvO1PntS4t0sQTQ5qaZN7oU6ih5qeCFGAP1R4rECZrrV9/ZOOsocOKX+dE8oZzw2/6GHTSzDkn4vBAOy3FVi+wcA8/kA1RXp5JLnb2WYwgnJY4T8B0zzGVWJQyxlDF1Yn6CEwGcAqXGDH+MxRFvk9FxxkLHGUwDSfqDAArq+dNF5cttzFIxwi3FHMLwmanfxo9Exqr4/7OO8Dz+ndCEaUoBVBJKPVtD56YOA2fDm3PFdcw0tc64IIwY4xWH3S2KCD+ywMfBbSnlyMeED5BYIB8mvB0zOr0mug+ryTwdObz//6hqmqr4DcsudPUggLQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ur-0004os-Sf; Sun, 24 Nov 2024 02:57:33 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 53/58] gnu: commencement: kernel-headers-boot0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:33 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504618381 (code B ref 74290); Sun, 24 Nov 2024 07:57:33 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:26 +0000 Received: from localhost ([127.0.0.1]:60900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uj-0004mC-PB for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UG-0004dR-56 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:56 -0500 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 1tF7UA-0002Is-V6; Sun, 24 Nov 2024 02:56:50 -0500 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=PrN9Kk4W1Jf/U7iXJ0r18w4mwJp1ou3k1AyIvUEhUAE=; b=sObK24yJIsa24IaIYZvz sJq3qGfWFxnvWC0orcrJtf5jGL6Q3eJarrnFQjAUBNzqMvrutvtVMqelTbYstT6w5IadCRl4YZbHp wpRBYuzfL60Yqfcj92oydSMN3bajELuOarzKTinHTy3bxDiQxLHoRcmJyoAiYwgrf7M1m3X3TBe+Z HhFBRIxoumiEQzvKUS4UxgAP9O8VzDJ2GxBifz2BlyyMkniBEJGYjRmMtY3ci68SoflizgblA+jky IRg4wbQhf4jQ7lxIBGXOknkbRbWVJUx2gLY1mkljLWBS7w+sm/26YCBkB6PIpDAaPM2W2n3EDI+TN j7y4xWBv+/NHTQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:16 +0100 Message-ID: <8920d690de4871ea09c32ebcd12831cbc88351d0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/commencement.scm (kernel-headers-boot0): Match using target-hurd? rather than "i586-gnu". Change-Id: I3c05f110674e55c97d6712202da9d9af6c1d953f --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3f11bb3384..dab65c7ca1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2742,7 +2742,7 @@ (define/system-dependent hurd-core-headers-boot0 (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system - ("i586-gnu" hurd-core-headers-boot0) + ((? target-hurd?) hurd-core-headers-boot0) (_ linux-libre-headers-boot0))) (define texinfo-boot0 From patchwork Sun Nov 24 07:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33815 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 695C727BBEA; Sun, 24 Nov 2024 07:58:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 1F26E27BBE2 for ; Sun, 24 Nov 2024 07:58:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VO-0000tt-FN; Sun, 24 Nov 2024 02:58:08 -0500 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 1tF7Us-0000Uz-R0 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:36 -0500 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 1tF7Us-0002S3-EZ for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 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=qoubATqRvpGsRjmPxgZA0YpRqvLFlUGMrYPhUmtDjOg=; b=qd4LBlrE+wClhnWC1QEZ11LQlN+ZCuo5XpVGWfmdQeQoer6cXX586lQ3QZDY9ZsK1Vcwy7SfN5N1X9cO7t8CbzRCZwHMbLhcKC8zKTpSGhgg1LjsNU/s/o36IM3DXlXQWsvkYuujh4pUCaq0jzFXkbK1Ru6EKQt6DCT4iNSRRQiyq+OpuCeoSZs2yT/Tg21tDTlcYwfqVy5SzNHKAFEqMzGPXrcH4rBt8O5osKCcyHm3Py9RasCw8rxHHcJSJ5/YH8IHdKkFUVnBqExii1XvqYlkkVBRU1a3wbCNtV1HCVGb3HZCIMMv9v/M8NtHE6CU+3AdcmlczRO1Veo1sM1afw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Us-0004p0-9y for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 54/58] gnu: hurd: Add refcounts-assert patch. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:34 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504718397 (code B ref 74290); Sun, 24 Nov 2024 07:57:34 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:27 +0000 Received: from localhost ([127.0.0.1]:60902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mM-6z for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UG-0004dS-Vg for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:57 -0500 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 1tF7UB-0002J0-PB; Sun, 24 Nov 2024 02:56:51 -0500 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=qoubATqRvpGsRjmPxgZA0YpRqvLFlUGMrYPhUmtDjOg=; b=TIvmAC7Job2yUyrGnVwO ZLIOiL+7/T8KHghstFUHNQxSMusfZQffNHbijrIu/tMmmdiyHITnhlBMeSz3jQbJXPfuFuYmbBam1 mhKVVI06NE2H20oumg2Fqdm0lJSpQthGaYHbOanWrL1B/Ls5kzLYwS/gRfeeJL5t/3kpPPeb1G36z e43IHNea4FvOOIQeqY9WDttH44ZW47i8mZIUj9lrMcK4CqyvHDghRz/wcrmJGFBLG/Yba8C0ojQw0 ZGNTtl0vEG820SsX9n/+zJkf5h21qULceXaDbNQkyglpUIkIXgwOtCqG5tvZOqqHLSwYZ/C5x4+xe oq3PtkltUk/WTw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:17 +0100 Message-ID: <473ee0bdce15a1b12924885e9740cd0d1b54b6f9.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 See . * gnu/packages/patches/hurd-refcounts-assert.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (hurd): Use it. Change-Id: I51ee319f1b7e26a7ed0f4e9f69755aa596ea6877 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 3 ++- .../patches/hurd-refcounts-assert.patch | 26 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hurd-refcounts-assert.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08314ade22..c75345ee93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1556,6 +1556,7 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-64bit.patch \ + %D%/packages/patches/hurd-refcounts-assert.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-startup.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 63249b4ef7..61833219c4 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -316,7 +316,8 @@ (define-public hurd (name "hurd") (source (origin (inherit (package-source hurd-headers)) - (patches (search-patches "hurd-rumpdisk-no-hd.patch" + (patches (search-patches "hurd-refcounts-assert.patch" + "hurd-rumpdisk-no-hd.patch" "hurd-startup.patch" "hurd-64bit.patch")))) (version (package-version hurd-headers)) diff --git a/gnu/packages/patches/hurd-refcounts-assert.patch b/gnu/packages/patches/hurd-refcounts-assert.patch new file mode 100644 index 0000000000..fe6d5e814f --- /dev/null +++ b/gnu/packages/patches/hurd-refcounts-assert.patch @@ -0,0 +1,26 @@ +Upstream-status: Taken from . + +libports-iterate-refcount.patch> + +http://lists.gnu.org/archive/html/bug-hurd/2016-03/msg00034.html + +diff --git a/libports/bucket-iterate.c b/libports/bucket-iterate.c +index b021b99..76dc3f7 100644 +--- a/libports/bucket-iterate.c ++++ b/libports/bucket-iterate.c +@@ -58,7 +58,14 @@ _ports_bucket_class_iterate (struct hurd_ihash *ht, + + if (class == 0 || pi->class == class) + { +- refcounts_ref (&pi->refcounts, NULL); ++ struct references result; ++ refcounts_unsafe_ref (&pi->refcounts, &result); ++ if (result.hard == 1 && result.weak == 0) ++ { ++ /* This one is on its way out, skip it. */ ++ refcounts_deref (&pi->refcounts, NULL); ++ continue; ++ } + p[n] = pi; + n++; + } From patchwork Sun Nov 24 07:55:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33827 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 3D5A627BBE2; Sun, 24 Nov 2024 07:59:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 32DF527BBF2 for ; Sun, 24 Nov 2024 07:59:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vz-0001h0-RE; Sun, 24 Nov 2024 02:58:44 -0500 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 1tF7Uu-0000Vf-MU for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:37 -0500 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 1tF7Us-0002Sd-Su; Sun, 24 Nov 2024 02:57:36 -0500 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=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=; b=iELUVdZf7uexv1fheeZP5HHwNrFST9WN5cW0DVpxOrmax/yjkQEq5OaKlHlryw59BnKVVyiN1R6rDDMdxaGtAegskikFeiQuPAU9RSfk3vb5lp2HqDlIyV5KqvhGVUd6RJDnZvZAaR7KUzqd9pMJAWGT+Kez+Sz6G9RzdRGoGn89a8etik0Ouz+pL+R+OWrs/K5iZkeM/WaG0dMQhnaTMcu5mYKbSdRB8w92GylEr4oGFQSrB8A1kkKqVBfEQT2hmYwIaqm06zJrh2pVnsKboa9DxjV4/Nn6GcXaUT5z/7Uu8rrBFEVNtwTA2BJfiIWVtx22/b5aLRAE23cy02ndow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Us-0004pA-Oi; Sun, 24 Nov 2024 02:57:34 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 55/58] gnu: bootstrap: %bootstrap-gcc: Also wrap g++ for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:34 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Efraim Flashner , Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504718404 (code B ref 74290); Sun, 24 Nov 2024 07:57:34 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:27 +0000 Received: from localhost ([127.0.0.1]:60907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mg-Uk for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UI-0004dW-16 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:58 -0500 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 1tF7UC-0002J7-Qa; Sun, 24 Nov 2024 02:56:52 -0500 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=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=; b=ptnbPd9Q/I6WJD6SpK6v I9OAlrQkChtTFSQsAUXA0XFSaq3D5ZCT+un5YLxDB2KNRqTiRNhZ5XBL8vSGmXnORnLARfr7NnBsM nBCrowGDRRLHYJMKQGLpgYb7XqCxuskrkqrO1EG32IPAiFe2/UYTssGZHePsBUBXoFfsk0CKCnERc b0Ug7u12ZjQtEALvk9mNsy8KTLf2HzeXoMYkUUuEdKJ7jyibuNAalENpshLqj4UshqiHYdp+UmnEU 0WNGX2/kXe8+KdG0kqSIaOeW8oZYzcrAyql+VNhemz4gwagUqGsGz45eSvTPSFi6Equc/NlYzuFri /q/RZ0zbIrFpMQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:18 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/bootstrap.scm (%bootstrap-gcc)[arguments] When building for thee 64bit Hurd have the #:builder also wrap g++. Co-authored-by: Efraim Flashner Change-Id: I2cdbc6837e1c451f108b309f2608240a7f57b82c --- gnu/packages/bootstrap.scm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a6cdda2122..48c7b42cc9 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -866,29 +866,36 @@ (define %bootstrap-gcc (tarball (assoc-ref %build-inputs "tarball"))) (mkdir out) - (copy-file tarball "binaries.tar.xz") + (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link (invoke xz "-d" "binaries.tar.xz") (let ((builddir (getcwd)) (bindir (string-append out "/bin"))) + + (define (wrap-program program) + (let ((wrapped (format #f ".~a-wrapped" program))) + (rename-file program wrapped) + (call-with-output-file program + (lambda (p) + (format p "#!~a +exec ~a/bin/~a -B~a/lib \ + -Wl,-rpath -Wl,~a/lib \ + -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" + bash + out wrapped + libc libc libc + ,(glibc-dynamic-linker))))) + (chmod program #o555)) + (with-directory-excursion out (invoke tar "xvf" (string-append builddir "/binaries.tar"))) (with-directory-excursion bindir (chmod "." #o755) - (rename-file "gcc" ".gcc-wrapped") - (call-with-output-file "gcc" - (lambda (p) - (format p "#!~a -exec ~a/bin/.gcc-wrapped -B~a/lib \ - -Wl,-rpath -Wl,~a/lib \ - -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" - bash - out libc libc libc - ,(glibc-dynamic-linker)))) - - (chmod "gcc" #o555) - #t)))))) + (for-each wrap-program + ,(if (target-hurd64?) + ''("gcc" "g++") + ''("gcc"))))))))) (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) From patchwork Sun Nov 24 07:55:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33836 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 97B7327BBEA; Sun, 24 Nov 2024 07:59:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 5EEF327BBE2 for ; Sun, 24 Nov 2024 07:59:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Wc-0002ap-KM; Sun, 24 Nov 2024 02:59:22 -0500 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 1tF7WL-00029F-07 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:59:12 -0500 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 1tF7WK-0002io-Dd; Sun, 24 Nov 2024 02:59:04 -0500 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=feTzeLEZGTB7ah3HXKXNglmeGzuIMI8rPmaGtJtoGYE=; b=e+EbH/0aefWuRQ5iMm3xMe7MfTueEhJbYerptUnDfNC8NsOmyDhrqCu8U9wKXKuareFw0QemJvdplrHqKqYtOHe+W5/sdHOtmWnxDMYPXmcGPbXOI0bD1AFbpRuXRJbCqNoEOSFO4jedgfrspsjtwhGUwH2JX3pUXyVr4SX1WreH8WYu2//quAuOxxZ+5AccKa0qNFVi96ez/u21j+MmwzZIas/Lxnqt5i7hHNWvuTwvCgthF/T2Pi4InWJHQtGRrIzeo+mtFZ/UAcF+wjuV0MVKxbtnNkljzhMTnNvYspbTGZdo28Pt/jVi5s6P3GTr33LsTat2y2OWy5CMfdmWGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7WI-0004sP-Cc; Sun, 24 Nov 2024 02:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 56/58] gnu: commencement: libstdc++-boot0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243513118709 (code B ref 74290); Sun, 24 Nov 2024 07:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:51 +0000 Received: from localhost ([127.0.0.1]:60952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W6-0004rg-HK for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UK-0004dr-B3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:00 -0500 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 1tF7UF-0002JM-4q; Sun, 24 Nov 2024 02:56:55 -0500 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=feTzeLEZGTB7ah3HXKXNglmeGzuIMI8rPmaGtJtoGYE=; b=aK42UhKI1SZBqFseo2Dd /cucq5uqiwJXYr76XnqZHTln1f5l/OqzmNYsXFRffwj37ecDWCdyyv10u6UmG09y20TRmNdtFIlob IoybdvC/Cn4j8QfE3bBXFQ03LoEbAZGxqDBwGEFsnWaanpM3PysPLBo+t2c96b7o8vp5HPLCINkja tSRFRgPGVA0z8C7P9GW+VPr4OfS6w3+HNMXPT9TVPG6h2qTukX1AUoASnCOr6EB6zS/cAMYeTCixf VuMXdDpMG/VqTOjsY6nnFull7GXot1H485EonpnmHIV277CNx9Ic109o43Z+XHq7Yh4382IzPCvdy Bbj3tl1lDdCQPw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:19 +0100 Message-ID: <5f6e1725357abea8b870ce7272053961be6dc52f.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/commencement.scm (make-libstdc++-boot0)[arguments]: When creating libstdc++-boot0 for the 64bit Hurd, add disable options similar to libstdc++ to #:configure-flags. Change-Id: I00636fa48e38823b00ede7dcbd0c1c23544d898c --- gnu/packages/commencement.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dab65c7ca1..2a32485fc0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2288,6 +2288,14 @@ (define (make-libstdc++-boot0 gcc) #:validate-runpath? #f ,@(substitute-keyword-arguments (package-arguments lib) + ((#:configure-flags flags) + (if (target-hurd64?) + #~(cons* "--disable-shared" + "--disable-libstdcxx-dual-abi" + "--disable-libstdcxx-threads" + "--disable-libstdcxx-pch" + #$flags) + flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-gmp&co From patchwork Sun Nov 24 07:55:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33834 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 2D1B027BBEC; Sun, 24 Nov 2024 07:59:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 A70C227BBE2 for ; Sun, 24 Nov 2024 07:59:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7WY-0002VD-8N; Sun, 24 Nov 2024 02:59:18 -0500 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 1tF7WJ-00026L-CF for guix-patches@gnu.org; Sun, 24 Nov 2024 02:59:04 -0500 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 1tF7WJ-0002iL-2j; Sun, 24 Nov 2024 02:59:03 -0500 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=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=; b=pdcwC/UJk8JqpgsLTW6W9ODo4zZExWK3nVrBwgXKGVs44hJrmBeetNZ4KsByKZJR1n3fhQD7t36N7wMkzBS2rL5gHLWUHyuiLJYApfkl3e/1PY1ay9wX9xsbK/h2dHTBDwks5xUG5xpgK6x2GwOjDKWQpkydpV6eWcd/8IiVvq7cb3Vq/YX5NQ8Aa4+IzSOtfS3SYh/V+7wgzIo6idcdIo3vDjtsuZ2e0ycTXWivkMYQjoAS+TEtJb1ee1wmEVtL7imcqURzu3yzxL5edWaiJvxWzjma1qufzvm0ncQEM5QLliUkr7c9kZqXh0XlenRA7QVPsNIsHjAOXjB6nA9TCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7WI-0004sa-T8; Sun, 24 Nov 2024 02:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 57/58] gnu: commencement: gcc-boot0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243513118717 (code B ref 74290); Sun, 24 Nov 2024 07:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:51 +0000 Received: from localhost ([127.0.0.1]:60954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W7-0004ri-68 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UL-0004e4-Eo for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:01 -0500 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 1tF7UF-0002JU-Vw; Sun, 24 Nov 2024 02:56:56 -0500 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=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=; b=OmxUhQcyHMnMoox6IT2S C45n0bPlw5Iui7O1NMP6SHVy7Q3LrTucduVRtXNABgiq6cWXuT6hMlSsdT73nVEmX5F188ROXWgIR e7TkluUvUynkIA1QAd1GNMiBon/6IhLFShSr77ZRjgxIHplTJ1SqYaq1OTAnXjictQOIZI5ubwoUf OhbeWB32e6+4WwNkRIRpFvgaskBea86eTMsBxGj+5QBDiODolJUTMJmG0avjLziert/m9gWd2LFmn +wBUuZL0vUWazuKwMmusx3eiY0tl2uJxu5jXy6Sky+TredC6QoS0Rb4cRV4sg5AkN1fwyAyw13qET con0BXUPt6SdMA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:20 +0100 Message-ID: <636bfab83864d614e1bb7e74db3810fe8f9b0fc9.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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 Asking gcc to "--disable-shared" is overridden for libcc1 by the build system, which lateron fails with install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory because no shared libcc1.so.0.0.0 could actually be built. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: When building for the 64bit Hurd, add CC_FOR_BUILD to #:make-flags to convince gmp's configure that gcc works. Also, add phase "patch-libcc1-static" to avoid attempting a shared libcc1. --- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2a32485fc0..3dbd27b660 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2391,13 +2391,21 @@ (define gcc-boot0 `(let* ((libc (assoc-ref %build-inputs "libc")) (libc-native (or (assoc-ref %build-inputs "libc-native") libc))) - `(,(string-append "LDFLAGS=" - "-Wl,-rpath=" libc-native "/lib " - "-Wl,-dynamic-linker " - "-Wl," libc-native ,(glibc-dynamic-linker - (match (%current-system) - ("x86_64-linux" "i686-linux") - (_ (%current-system)))))))) + `(,,@(append + `((string-append "LDFLAGS=" + "-Wl,-rpath=" libc-native "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc-native + ,(glibc-dynamic-linker + (match (%current-system) + ("x86_64-linux" "i686-linux") + (_ (%current-system)))))) + (if (target-hurd64?) + ;;Convince gmp's configure that gcc works + (list (string-append + "CC_FOR_BUILD=gcc" + " -Wno-implicit-function-declaration")) + '()))))) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-gmp&co @@ -2421,6 +2429,20 @@ (define gcc-boot0 char-set:letter) #$(package-name lib))) (list gmp-6.0 mpfr mpc))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-libcc1-static + (lambda _ + ;;Attempting to build libcc1 shared gives: + ;; install: cannot stat '.libs/libcc1.so.0.0.0': + ;; No such file or directory + ;;convince gcc harder to not build a shared libcc1 + (substitute* "Makefile.def" + (("module= libcc1; [^;]*;") "module= libcc1;")) + (substitute* "Makefile.in" + (("(--target=[$][{]target_alias[}]) --enable-shared \\\\" + all target) + (string-append target " \\")))))) + #~()) #$(match (%current-system) ((or "i686-linux" "x86_64-linux") #~(add-before 'configure 'fix-libcc1 From patchwork Sun Nov 24 07:55:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33833 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 C966527BBE2; Sun, 24 Nov 2024 07:59:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 6D83F27BBED for ; Sun, 24 Nov 2024 07:59:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7WY-0002V3-8J; Sun, 24 Nov 2024 02:59:18 -0500 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 1tF7WJ-00029B-T0 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:59:05 -0500 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 1tF7WJ-0002iS-J2; Sun, 24 Nov 2024 02:59:03 -0500 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=KEatdoaMsLm6sff5++m1V0tmRoOnqBS5FwUubhW7YlQ=; b=oGbOpCc2iX1+ZyChn3VHVIi0mFjz3g+DbQ8tQ5Pv1CzCAyPXYbIS6dIJQWT5gLaG6pOatAMjQvMpzCA0Fde8bzbuekIxetI5rQsnYujFUWtoLY3S7/DEP32pn3KNQ0fXmpZyK+I7yVy9xnu9cSSZtHGWZF41Vhs2QknmhI5SpsWYahCV5JhNOhNrOrzrcnLiSCkVVD/E5zSYBaU+VX1C2Y8mOfRoIB0UHsVo5tadLFQR69W8+kVItSThcy/I4//goQdVHYA8gzYUnyfOvcQsD+MLdNi1ytOq6VBtw6hcsN3O2vf1XvUyG+kpoa/Lcc0Hq2xhOt8MKN+zzfz5Ux/2pA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7WJ-0004sk-Dm; Sun, 24 Nov 2024 02:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 58/58] gnu: commencement: gcc-final: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243513218723 (code B ref 74290); Sun, 24 Nov 2024 07:59:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:52 +0000 Received: from localhost ([127.0.0.1]:60956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W7-0004rq-LN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UM-0004eA-6I for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:02 -0500 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 1tF7UG-0002Jc-Pa; Sun, 24 Nov 2024 02:56:56 -0500 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=KEatdoaMsLm6sff5++m1V0tmRoOnqBS5FwUubhW7YlQ=; b=ZLjD7qB40HOyPR6iGjDt 9qGuVjKOVtYBMg0K2a0eGbElpbwqufzTw5wP6byBygAsnwiIu9X6JbaabytIj2dCB0RxiSjERVIxV qLQhClAEO1R6NFKkItrmgoz8U199BsrWCZNw7C70tWfQ6VLdnB/FI564jVK78jHLwBvBHR7eyS+Aj 64enN+srnMzNUfoJzN0+0ikjaviCNCf0olPcY4gZytQh2y89jfqz71bASg9zfpdzc5+wQORX5KSKx wQTLYork2G7PaOWzLIIWm645HAkj83GSHYcg6xgynRDSY69IfBtKdV5gqtSW6OH5mNt+9IUe3vp0r 5LVEL2qesSZRbg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:21 +0100 Message-ID: X-Mailer: git-send-email 2.46.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/commencement.scm (gcc-final)[arguments]: When building for the 64bit Hurd, create a gcc wrapper in phase "create-stage-wrapper", use it by adding STAGE_CC_WRAPPER to #:make-flags, and CC to #:configure-flags to convince configure gmp that gcc and g++ work. Change-Id: I939c03c6c0fd9698efc4b293e59cf576249e3b77 --- gnu/packages/commencement.scm | 37 ++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3dbd27b660..4368893f4d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3255,13 +3255,32 @@ (define gcc-final ;; Since $LIBRARY_PATH is not honored, add the relevant flags. #~(let ((zlib (assoc-ref %build-inputs "zlib"))) (map (lambda (flag) - (if (string-prefix? "LDFLAGS=" flag) + (if #$(if (target-hurd64?) + #~(and (string? flag) + (string-prefix? "LDFLAGS=" flag)) + #~(string-prefix? "LDFLAGS=" flag)) (string-append flag " -L" (assoc-ref %build-inputs "libstdc++") "/lib -L" zlib "/lib -Wl,-rpath=" zlib "/lib") flag)) - #$flags))) + #$(if (target-hurd64?) + `(cons + (string-append + ;;Convince gmp's configure that gcc works + "STAGE_CC_WRAPPER=" (getcwd) "/build/gcc.sh") + ,flags) + flags)))) + ((#:configure-flags flags) + (if (target-hurd64?) + #~(append + #$flags + (list #$(string-append + ;;Convince gmp's configure that gcc works + "CC=gcc" + " -Wno-implicit-function-declaration") + "--disable-plugin")) + flags)) ;; Build again GMP & co. within GCC's build process, because it's hard ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) @@ -3306,7 +3325,19 @@ (define gcc-final (getenv "CPLUS_INCLUDE_PATH") #\:)) ":") - "\nAM_CXXFLAGS = "))))))))))) + "\nAM_CXXFLAGS = ")))))) + #$@(if (target-hurd64?) + #~((add-after 'configure 'create-stage-wrapper + (lambda _ + (with-output-to-file "gcc.sh" + (lambda _ + (format #t "#! ~a/bin/bash +exec \"$@\" \ + -Wno-error \ + -Wno-implicit-function-declaration" + #$static-bash-for-glibc))) + (chmod "gcc.sh" #o555)))) + #~())))))) ;; This time we want Texinfo, so we get the manual. Add ;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of