From patchwork Sun Nov 10 10:37: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: 70174 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 D993B27BBE2; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 75CBD27BBEA for ; Sun, 10 Nov 2024 10:39:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5LV-0008TL-BT; Sun, 10 Nov 2024 05:39: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 1tA5LT-0008Sp-Py for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LT-0007s2-HK for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=auKcBDNSo1NhBm3IxC2qXvyrIyuZxusLWl6k1n9ZpFU=; b=t0mifi7EIBBxP9WLvccv6qKorHZDCoRVaEzrlTgO0TreVlAowjy53zq/yfB60ZIyir2+fGfOQhxQxDOwIC73hVHMzmtcZ+ocGgsGx0JFOUly3F65eb5HSAe8ojewyPCWjaLeSXoagSCYJUd/v5d2UhySTJE4Qam2Lim2qtm/TVF9285BXaj6Fxj8++uZygEYrSMWwB1apGYOSsT+nck6ld6taWPgIk0R1DZILQgCjAs+wQ1YxAmr3Wu61DgE1x70OpqGifBcVq9Seke4YljXYggXboupSzAzJgtKc2+UiOl/4w+81MUtvhnQTPymRFLxGysUwAkyHKPYLsNHzyABOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LT-0002Zr-BC for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 01/31] gnu: mig: Update to v1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351329776 (code B ref 74290); Sun, 10 Nov 2024 10:39:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:52 +0000 Received: from localhost ([127.0.0.1]:55669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LH-0002XU-IB for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LE-0002Wt-9U for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5L7-0007kq-0y; Sun, 10 Nov 2024 05:38:41 -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=auKcBDNSo1NhBm3IxC2qXvyrIyuZxusLWl6k1n9ZpFU=; b=g5NNSOo19Fxv/xivI5Zc 5JgEbJ8Qyf18X0b4rUQXhp+HmXAUs8OVGc2043Ckdu5Olg7THM8hsh+DNnvth1NZ7xpQU9r1+Xkfi CtbO2Xlk2SFsQHvpJ9mqBSRMnukFtX0dTH63SCcfDHwGfWlDquzOeFZjCaa5/MoIA3/J+ciKcb+N3 eVlKd+PsYfr2JP1DY9lwCc+S1DJIVbzTSCmZqqDZQR7f7jYVG0O0LPEzf064shU1rVOA80dTFM8+/ puTeuji9ysEX+kd9MpNSL9Ch+vlT1B1ck4BFpvmEcn+vKx8BJXkj+NOevcUaK1FFRAupTs3Yl8NH/ ZCcj5VUdc8Dmzw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:57 +0100 Message-ID: <2b7c13c96850e5a00c9986fcad82215d06405291.1731232753.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 (mig): Update to v1.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 9c1681f236..0a7db31e1c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -93,7 +93,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 @@ -102,7 +102,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 10 10:37: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: 70167 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 E466527BBEA; Sun, 10 Nov 2024 10:39:13 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 4CBE927BBE2 for ; Sun, 10 Nov 2024 10:39:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5LU-0008T6-5y; Sun, 10 Nov 2024 05:39: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 1tA5LS-0008Sg-Vp for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LS-0007rZ-N6 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=UEA/nBJdy+NcarcExOzTCO4FuH3zPcr1KKzLCuq25HuRScDfnX4a4Sldmoo6cDc8DKQKYBYi4CrFlDhzGgw/qN3w40aF2/2QSk2myzzWIEwuNuhrbcU5JqsYn8HwqLMi25FZEpmaMllWRRCLf9K8rSDlEPtCWpE3FjSRiI1eBmhGSdU8EwmPYM8hyHjZGqMblgncGSTz9VsE9FzBIBALyVQCmXxKH1IGopr4MsAscNF2CuDobASVUEXYlD/F0FdBaFsMGinejAd7WflPQUA0xNEYuuGp3Gj7TnrDQQ/ISpx+9tFI0uHH7X3m0lGe7Q9niD9Z7g3kHvnTYkR1VEL2ng==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LS-0002Zd-Gr for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 02/31] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351319767 (code B ref 74290); Sun, 10 Nov 2024 10:39:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:51 +0000 Received: from localhost ([127.0.0.1]:55665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LG-0002XQ-Ss for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LE-0002Ws-9Q for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5L8-0007lE-Hv; Sun, 10 Nov 2024 05:38:42 -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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=HdW8euZ2vLICXU9UwSLy NdDfQJKbFNBBkMeHNwM+X9gVeRgsh0JMVghLC3uzCa8SsLohnbOZJkH/uMhVqiQhYlJYikYGyCW4R +gLCCWh2AemjV1zRzUrAQGriToq8ZN1vqSx6bg21Q9Y4vKr/A5OCbilMr2vFUUJnoIGgov4ZIH8OR 8m6QKN9AJmI444bh9pGkZGrF62uxX2h2VeK23PytUPzTmy0SeQyctfjwNx2cNq6Apv/daSQVSwb6P alNhdX0R2gp/pSzkmHe91fIynZpECcbgODouOIMMoexuJJ7PrtIHymV1E0EIAf8q3PntG0xRqAD7w 8DZIElrRQm87IQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:58 +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/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. Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 9 ++++----- gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c810117eb..4d3ee9ea35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1459,6 +1459,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/hurd.scm b/gnu/packages/hurd.scm index 0a7db31e1c..28f39cc448 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 10 10:37: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: 70168 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 9468B27BBEA; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 3F64B27BBE2 for ; Sun, 10 Nov 2024 10:39:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5LW-0008Tf-8G; Sun, 10 Nov 2024 05:39: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 1tA5LU-0008TD-Md for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LU-0007sI-DM for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=rZoDEHEogHQvhH1RnKmgRuCcRE4vSSJxHYymrmWOqwc=; b=UxlEahbdGiO0WkURYpeMXBnxaXX517VDazWeW7U13KNSap91YtscQgirzyo6R5eyf9HJn1AsHBhEi+XsE9mlUMOUKzruhJpZ+f7sipI4q9lISDMo7jZoAlL3XCtI+tYhpvswTTn2RS09P5Ldf/CWovojg/7hivDhmOI3+Jetc5M4N7+mDNLynzDvvn82OHyOhj1WwLpxF9KSuX6RBm79VBQUv3aioU1vU8NW7l0PHnKmKJUsIRCGztekeRyGkgIHvLT7EfyDAvzEINYRefemQI/4FP/QBPIPCZ7OYs+EYdjH/hNHwLOkbWaKC9YQ1U/sDKFc2aADgKe1VfMyBcOxjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LU-0002a2-7m for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 03/31] gnu: hurd: Update to v0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351339785 (code B ref 74290); Sun, 10 Nov 2024 10:39:04 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:53 +0000 Received: from localhost ([127.0.0.1]:55673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LI-0002Xd-7Y for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LF-0002Wv-JY for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LA-0007lx-7v; Sun, 10 Nov 2024 05:38:44 -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=rZoDEHEogHQvhH1RnKmgRuCcRE4vSSJxHYymrmWOqwc=; b=h2XFoeuRxdGBoX5wiNxm Dt/pWwb1FNmELnYKsBWrN8opadwCJqmGz5U41GYYfcDCARM9skzJ5FhTP1jLpuV2LlmAcRmLLPIMR RetIyzZPQAtpy/4aJe9Y4fsQfAuaVkFY20tR/DPeLLomA7AJQkbCkZpbjDJD0MiNkSdrZr9ociNLl pmHi2M5UtKx50rWY0oXa4ibNu80TVV2aEWzb5CmHQOIIzCyFUkMmffddYqhGzdACWsDxgUC33pIb8 8PzF/yPDmB1QtB4SaFyhIX6+4ka2RKrQ3Wpbj+VdRHGQNawBCt6EogLTTB3+spJ1MwFBi0M75pILl T863AvivCr50RQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:59 +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 (hurd-headers): Update to v0.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 533a4154d6..6e1ebbcc9c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1534,7 +1534,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 10 10:38:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70176 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 7255827BBE9; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 2A0C427BBE2 for ; Sun, 10 Nov 2024 10:39:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Lw-0000Oh-Cg; Sun, 10 Nov 2024 05:39:32 -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 1tA5Lo-0000F9-0L for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Ln-0007wX-NZ; Sun, 10 Nov 2024 05:39: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=MG+VinxqeEt9sHGJBjYsbzkB3oQWjKWdLFD2N5KB47k=; b=i9Qs6bZaMDZGe60fvgtG+xltPCGyeAABbn1qm0YC1egBDMztpwCfXg3VMUNk6gUr0GoVW1xvjch/busaoZ/wKuq5hmeGBhvYn3XeqD1F/7K8OBOO/EzL7Y7lQoArul4yccCObRSV2jbW0EzYXjLS2+WvdtowNZZFMnb2+yP+abGGlVaD7Wn/4f5Bvqep4OM6Mtb1kMRuQ9MYND0QMkUu8c1EmzAzi+0gCjxKOaRVabV3O/jZLJdcFsLW2k9wT6bqwBDuwkGBDsfj55DeQ6KD2eiidoKjz2B+v9cAKHijYKo9MloPa19izdF2hqwxdBpt5kM+XO9TaWW5ozX9Y5fu1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LY-0002bO-3e; Sun, 10 Nov 2024 05:39:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 04/31] gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, glv@posteo.net, cox.katherine.e+guix@gmail.com, ludo@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, zimon.toutoune@gmail.com, vagrant@debian.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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 Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Guillaume Le Vaillant , Katherine Cox-Buday , Ludovic =?utf-8?q?Cou?= =?utf-8?q?rt=C3=A8s?= , Munyoki Kilyungi , Sharlatan Hellseher , Simon Tournier , Vagrant Cascadian , jgart X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Guillaume Le Vaillant , Katherine Cox-Buday , Ludovic =?utf-8?q?Cou?= =?utf-8?q?rt=C3=A8s?= , Munyoki Kilyungi , Sharlatan Hellseher , Simon Tournier , Vagrant Cascadian , jgart Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351459938 (code B ref 74290); Sun, 10 Nov 2024 10:39:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:05 +0000 Received: from localhost ([127.0.0.1]:55697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LR-0002ZP-71 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LG-0002Wy-Tu for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LB-0007mH-FI; Sun, 10 Nov 2024 05:38: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=MG+VinxqeEt9sHGJBjYsbzkB3oQWjKWdLFD2N5KB47k=; b=kjMeye03qRUy9z4A951x lRJp1zmj2a9YXaZvQs+MUHAwdRnldt6lUEXtFEehS7J/xnbXLRM15UQ27dkKljc5iZTBItqQNRxoq RbbUKDYYhtYomRSguEDnvq7n3e84h1cesnUE2Tt2iLKZIbkKrHLwAT/c7uGLBydltdVAi0xQ6dm4O hrXP3mMOoFsbH0rIDDSEU+wogLDs5Gt1bftHHA4dDTP4TPyQpH19CST77mc9S/vLCJsJrrr0IOZKb gN+yaw9Ms8JDJn1HgqGSDpUK3u+lZ0JDJ/34+FpbDfndI4dWqXsP9g4/wM4xMFkOWxUAPCYdR/Aaa DSAGgMpEzEoi0g==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:00 +0100 Message-ID: <3e5801ce2795b91ba96a60ad239de717d0337a97.1731232753.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 Throughout: use (current-gcc) and (current-gcc-toolchain) instead of gcc and gcc-toolchain. * gnu/packages/gcc.scm (current-gcc): New procedure. (gcc): Deprecate. * gnu/packages/commencement.scm (current-gcc-toolchain): New procedure. (gcc-toolchain): Deprecate. Change-Id: I538897e53e2c9956abdc53c67621bb52cbd78a50 --- gnu/packages/avr.scm | 7 ++++--- gnu/packages/benchmark.scm | 6 ++++-- gnu/packages/bootloaders.scm | 2 +- gnu/packages/bootstrap.scm | 4 ++-- gnu/packages/c.scm | 4 ++-- gnu/packages/chicken.scm | 7 ++++--- gnu/packages/commencement.scm | 33 +++++++++++++++++++-------------- gnu/packages/containers.scm | 5 +++-- gnu/packages/cross-base.scm | 4 ++-- gnu/packages/dlang.scm | 3 ++- gnu/packages/engineering.scm | 4 ++-- gnu/packages/gawk.scm | 3 ++- gnu/packages/gcc.scm | 21 ++++++++++++++------- gnu/packages/golang.scm | 3 ++- gnu/packages/julia-xyz.scm | 3 ++- gnu/packages/lisp.scm | 3 ++- gnu/packages/llvm.scm | 7 ++++--- gnu/packages/make-bootstrap.scm | 20 ++++++++++---------- gnu/packages/mpi.scm | 3 ++- gnu/packages/parallel.scm | 5 +++-- gnu/packages/rocm.scm | 3 ++- 21 files changed, 88 insertions(+), 62 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 6042c1bd55..00dc124aa9 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,7 +54,7 @@ (define make-avr-binutils (inherit (cross-binutils "avr")) (name "avr-binutils")))) -(define* (make-avr-gcc/implementation #:key (xgcc gcc)) +(define* (make-avr-gcc/implementation #:key (xgcc (current-gcc))) "Return a XGCC-base cross-compiler for the AVR target." (let ((xgcc (cross-gcc "avr" #:xgcc xgcc #:xbinutils (make-avr-binutils)))) (package @@ -96,7 +97,7 @@ (define* (make-avr-gcc/implementation #:key (xgcc gcc)) (variable "CROSS_LIBRARY_PATH") (files '("avr/lib"))))) (native-inputs - `(("gcc" ,gcc) + `(("gcc" ,(current-gcc)) ,@(package-native-inputs xgcc)))))) (define make-avr-gcc @@ -136,7 +137,7 @@ (define* (make-avr-libc/implementation #:key (define make-avr-libc (memoize make-avr-libc/implementation)) -(define* (make-avr-toolchain/implementation #:key (xgcc gcc)) +(define* (make-avr-toolchain/implementation #:key (xgcc (current-gcc))) (let ((avr-binutils (make-avr-binutils)) (avr-libc (make-avr-libc #:xgcc (cross-gcc "avr" #:xgcc xgcc))) (avr-gcc (make-avr-gcc #:xgcc xgcc))) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 326bbc99b4..c802e105ed 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2024 Nicolas Graves +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,8 +76,8 @@ (define-module (gnu packages benchmark) ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. (define gcc-toolchain* - (delay (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain))) + (delay ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)))) (define-public fio (package @@ -379,6 +380,7 @@ (define-public phoronix-test-suite (list bash coreutils (force gcc-toolchain*) + gcc-toolchain* gnu-make gzip php diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fcc1088fd6..8ae9621e5b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1707,7 +1707,7 @@ (define u-boot-ts-mx6 (add-before 'build 'adjust-for-current-gcc (lambda _ (let ((gcc-major-version #$(version-major - (package-version gcc)))) + (package-version (current-gcc))))) (copy-file "include/linux/compiler-gcc6.h" (string-append "include/linux/compiler-gcc" gcc-major-version ".h"))) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3743abf9fe..c4640b62e1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012-2020, 2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017, 2020, 2024 Efraim Flashner -;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2020, 2022, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter ;;; Copyright © 2020 Jakub Kądziołka @@ -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/c.scm b/gnu/packages/c.scm index 13fdb99424..f52a7c603e 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019, 2020, 2022-2024 Efraim Flashner ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2019 Andreas Enge -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer @@ -178,7 +178,7 @@ (define-public cproc (string-append "--with-ld=" #$(ld-for-target)) (string-append "--with-gcc-libdir=" gcc-lib)))))))) (inputs `(("qbe" ,qbe) - ("gcc:lib" ,gcc "lib"))) + ("gcc:lib" ,(current-gcc) "lib"))) (supported-systems (list "x86_64-linux" "aarch64-linux")) (synopsis "Simple C11 compiler backed by QBE") (description "@code{cproc} is a C compiler using QBE as a backend, diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index 3743ae3e2a..64fd3cb86b 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 Evan Hanson ;;; Copyright © 2020 raingloom +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,9 +70,9 @@ (define-public chicken (files (list "var/lib/chicken/11"))))) ;; Reference gcc-toolchain lazily to avoid circular module dependency ;; problems. - (propagated-inputs (list (module-ref (resolve-interface - '(gnu packages commencement)) - 'gcc-toolchain))) + (propagated-inputs (list ((module-ref (resolve-interface + '(gnu packages commencement)) + 'current-gcc-toolchain)))) (home-page "https://www.call-cc.org/") (synopsis "R5RS Scheme implementation that compiles native code via C") (description diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ce40f0cea6..2b43759dac 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -73,7 +73,8 @@ (define-module (gnu packages commencement) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 vlist) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:export (current-gcc-toolchain)) ;;; Commentary: ;;; @@ -908,7 +909,7 @@ (define gcc-core-mesboot0 ;; with gcc-2.95.3, binutils (2.14.0, 2.20.1a) and glibc-2.2.5 we found a ;; GNU toolchain triplet "that works". (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-core-mesboot0") (version "2.95.3") (source (origin @@ -2319,19 +2320,19 @@ (define libstdc++-boot0-gcc7 (define gcc-boot0 (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-cross-boot0") - (outputs (delete "debug" (package-outputs gcc))) + (outputs (delete "debug" (package-outputs (current-gcc)))) (source (bootstrap-origin (origin - (inherit (package-source gcc)) + (inherit (package-source (current-gcc))) (snippet #~(begin ;; XXX: The GCC test suite contains files with non-ASCII file ;; names, which cannot be repacked by BOOTSTRAP-ORIGIN. Nor ;; can it be deleted from Guile, so resort to this evil hack. - #$(origin-snippet (package-source gcc)) + #$(origin-snippet (package-source (current-gcc))) (system* #$(file-append (let-system system ;; 'coreutils-boot0' is Linux-only. (if (target-hurd? system) @@ -2348,7 +2349,7 @@ (define gcc-boot0 (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:configure-flags flags) #~(append (list #$(string-append "--target=" (boot-triplet)) @@ -2436,7 +2437,7 @@ (define gcc-boot0 (with-directory-excursion (string-append out "/lib/gcc/" #$(boot-triplet) - "/" #$(package-version gcc)) + "/" #$(package-version (current-gcc))) (symlink "libgcc.a" "libgcc_eh.a")))))))))) (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) @@ -2951,7 +2952,7 @@ (define/system-dependent glibc-final-with-bootstrap-bash (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." - (package (inherit gcc) + (package (inherit (current-gcc)) (name (string-append (package-name gcc) "-wrapped")) (source #f) (build-system trivial-build-system) @@ -3218,7 +3219,7 @@ (define gcc-final (srfi srfi-26) ,@%default-gnu-modules) - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. #~(let ((zlib (assoc-ref %build-inputs "zlib"))) @@ -3541,8 +3542,8 @@ (define* (make-gcc-toolchain gcc (let ((gcc (if libc (make-gcc-libc gcc libc) gcc)) (libc (if libc libc glibc-final))) (package - (name (string-append (package-name gcc) "-toolchain")) - (version (package-version gcc)) + (name (string-append (package-name (current-gcc)) "-toolchain")) + (version (package-version (current-gcc))) (source #f) (build-system trivial-build-system) (arguments @@ -3639,13 +3640,17 @@ (define-public gcc-toolchain-14 (make-gcc-toolchain gcc-14)) ;; The default GCC -(define-public gcc-toolchain +(define (current-gcc-toolchain) + "The current default gcc-toolchain version." gcc-toolchain-11) +(define-public gcc-toolchain + (deprecated-package "gcc-toolchain" gcc-toolchain-11)) + (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package ;; automatically "redirects" them to 'gcc-toolchain'. - (deprecated-package "gcc" gcc-toolchain)) + (deprecated-package "gcc" (current-gcc-toolchain))) (define-public gdc-toolchain-10 diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index d32bc2704a..78304cebbc 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Foundation Devices, Inc. ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -533,7 +534,7 @@ (define-public podman (,(string-append #$catatonit "/bin") ,(string-append #$conmon "/bin") ,(string-append #$crun "/bin") - ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$(current-gcc) "/bin") ; cpp ,(string-append #$iptables "/sbin") ,(string-append #$passt "/bin") ,(string-append #$procps "/bin") ; ps @@ -667,7 +668,7 @@ (define-public buildah (,(string-append #$output "/_guix"))) `("PATH" suffix (,(string-append #$crun "/bin") - ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$(current-gcc) "/bin") ; cpp ,(string-append #$passt "/bin") "/run/privileged/bin"))))) (add-after 'install 'install-completions diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index cecc21083e..9c701efae8 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 (current-gcc))) (define %gcc-include-paths ;; Environment variables for header search paths. diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 8bf0ee685e..654d5b2281 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2021, 2024 Maxim Cournoyer ;;; Copyright © 2022 ( ;;; Copyright © 2022 Esther Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -426,7 +427,7 @@ (define dmd-bootstrap (build-system gnu-build-system) (arguments (list - #:disallowed-references (list (gexp-input (canonical-package gcc) + #:disallowed-references (list (gexp-input (canonical-package (current-gcc)) "lib")) ;; Disable tests, as gdmd cannot cope with some arguments used such as ;; '-conf'. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6f449f0c39..07f3edd4dd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2336,8 +2336,8 @@ (define-public freehdl coreutils ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. - (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain) + ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)) guile-2.2 perl diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 6a77a692f5..a8b8369d7b 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2022-2024 Efraim Flashner ;;; Copyright © 2021, 2022 Marius Bakke ;;; Copyright © 2022 Paul A. Patience +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ (define-public cppawk (inputs (list coreutils ; For dirname, mktemp, printf, rm gawk-mpfr ; Default variant, but supports others - gcc ; For cpp + (current-gcc) ; For cpp sed)) (home-page "https://www.kylheku.com/cgit/cppawk/") (synopsis "Wrapper script that adds C preprocessing to Awk") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c9e475b676..3b5d05b9a9 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Maxim Cournoyer ;;; Copyright © 2024 Nguyễn Gia Phong +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ (define-module (gnu packages gcc) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:use-module (ice-9 regex)) + #:use-module (ice-9 regex) + #:export (current-gcc)) (define %gcc-infrastructure ;; Base URL for GCC's infrastructure. @@ -857,7 +859,12 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define (current-gcc) + "The current default gcc version." + gcc-11) + +(define-public gcc + (deprecated-package "gcc" gcc-11)) ;;; @@ -868,7 +875,7 @@ (define-public gcc-2.95 ;; Note: 'gcc-core-mesboot0' in commencement.scm provides 2.95 as well, but ;; with additional tricks to support compilation with TinyCC and Mes-libc. (package - (inherit gcc) + (inherit (current-gcc)) (version "2.95.3") (source (origin (method url-fetch) @@ -1045,7 +1052,7 @@ (define-public (make-libstdc++ gcc) (define libstdc++ ;; Libstdc++ matching the default GCC. - (make-libstdc++ gcc)) + (make-libstdc++ (current-gcc))) (define libstdc++-headers ;; XXX: This package is for internal use to work around @@ -1100,7 +1107,7 @@ (define (make-libiberty gcc) (synopsis "Collection of subroutines used by various GNU programs"))) (define-public libiberty - (make-libiberty gcc)) + (make-libiberty (current-gcc))) (define* (custom-gcc gcc name languages #:optional @@ -1157,7 +1164,7 @@ (define-public gfortran-13 (define-public gfortran (hidden-package - (custom-gcc gcc + (custom-gcc (current-gcc) "gfortran" '("fortran") %generic-search-paths))) @@ -1186,7 +1193,7 @@ (define-public gdc-11 ;;; Alias tracking the latest GDC version. (define-public gdc (hidden-package - (custom-gcc gcc "gdc" '("d") + (custom-gcc (current-gcc) "gdc" '("d") %generic-search-paths))) (define-public (make-libgccjit gcc) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 00dde61f2c..27e0db9cb1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2024 Greg Hogan ;;; Copyright © 2024 Brennan Vincent ;;; Copyright © 2024 André Batista +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -253,7 +254,7 @@ (define-public go-1.4 (inputs `(("tzdata" ,tzdata) ("pcre" ,pcre) - ("gcc:lib" ,(canonical-package gcc) "lib"))) + ("gcc:lib" ,(canonical-package (current-gcc)) "lib"))) (native-inputs (list pkg-config which net-base perl)) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 77385ee6e0..3860da608e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2024 Spencer King +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -5170,7 +5171,7 @@ (define-public julia-quadmath (propagated-inputs (list julia-requires)) (inputs - `(("gcc:lib" ,gcc "lib"))) + `(("gcc:lib" ,(current-gcc) "lib"))) (native-inputs (list julia-specialfunctions)) (home-page "https://github.com/JuliaMath/Quadmath.jl") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6c16d8ab71..8dc3208327 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2024 Andreas Enge ;;; Copyright © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -388,7 +389,7 @@ (define-public clasp-cl (base32 "10jjhcid6qp64gx29iyy5rqqijwy8hrvx66f0xabdj8w3007ky39")))) (build-system gnu-build-system) (inputs - (list boost clang-15 fmt `(,gcc "lib") gmp libelf libunwind llvm-15)) + (list boost clang-15 fmt `(,(current-gcc) "lib") gmp libelf libunwind llvm-15)) (native-inputs (list binutils-gold ninja pkg-config sbcl)) (arguments diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9f851a478e..cd2ad311a0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,8 +90,8 @@ (define-module (gnu packages llvm) ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. (define gcc-toolchain* - (delay (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain))) + (delay ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)))) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -250,7 +251,7 @@ (define* (clang-from-llvm llvm clang-runtime (native-inputs (package-native-inputs llvm)) (inputs `(("libxml2" ,libxml2) - ("gcc-lib" ,gcc "lib") + ("gcc-lib" ,(current-gcc) "lib") ,@(package-inputs llvm) ,@(if tools-extra `(("clang-tools-extra" ,tools-extra)) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index edc536bff4..c6293b9a38 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver -;;; Copyright © 2018, 2019, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2021 Pierre Langlois @@ -108,13 +108,13 @@ (define gcc-for-bootstrap (mlambdaq (glibc) "Return a variant of GCC that uses the bootstrap variant of GLIBC." (package - (inherit gcc) + (inherit (current-gcc)) (outputs '("out")) ;all in one so libgcc_s is easily found (inputs `( ;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc)))))) + ,@(package-inputs (current-gcc))))))) (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by @@ -153,7 +153,7 @@ (define (package-with-relocatable-glibc p) (cons (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) - (package-search-paths gcc))))) + (package-search-paths (current-gcc)))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap glibc)) @@ -481,11 +481,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit (current-gcc)) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -536,7 +536,7 @@ (define %gcc-static (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(package-inputs (current-gcc)))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -549,13 +549,13 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs (current-gcc))) + (package-native-inputs (current-gcc))))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-stripped") (build-system trivial-build-system) (source #f) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index bc1fd797d6..e956167137 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Paul Garlick ;;; Copyright © 2019, 2021 Ricardo Wurmus ;;; Copyright © 2024 Romain Garbage +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -378,7 +379,7 @@ (define-public openmpi-5 "ompi/tools/ompi_info/param.c") (("_ABSOLUTE") ""))))) - #:disallowed-references (list (canonical-package gcc)))))) + #:disallowed-references (list (canonical-package (current-gcc))))))) (define-public openmpi-c++ (package/inherit openmpi diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 85f8a114c3..c0e3f44bcd 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 David Elsing ;;; Copyright © 2024 Romain Garbage +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -665,7 +666,7 @@ (define-public openpmix ;; Don't keep a reference to GCC. #:disallowed-references (and (not (%current-target-system)) - (list (canonical-package gcc))) + (list (canonical-package (current-gcc)))) #:phases #~(modify-phases %standard-phases @@ -737,7 +738,7 @@ (define-public prrte (string-append "prte_launch_agent = \"" #$output "/bin/prted\";\n")))))) - #:disallowed-references (list (canonical-package gcc)))) + #:disallowed-references (list (canonical-package (current-gcc))))) (inputs (list libevent `(,hwloc "lib") openpmix)) diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index e883371928..2f315e3985 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2022, 2023 John Kehayias +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; 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 @@ -131,7 +132,7 @@ (define-public roct-thunk-interface (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Not sure how to run tests. (inputs (list libdrm numactl)) - (native-inputs (list `(,gcc "lib") pkg-config)) + (native-inputs (list `(,(current-gcc) "lib") pkg-config)) (home-page "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface") (synopsis "Radeon Open Compute Thunk Interface") (description "User-mode API interfaces used to interact with the ROCk From patchwork Sun Nov 10 10:38: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: 70172 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 51BBF27BBE9; Sun, 10 Nov 2024 10:39:43 +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=-5.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLACK 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 36E7227BBE2 for ; Sun, 10 Nov 2024 10:39:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Li-0000Ca-If; Sun, 10 Nov 2024 05:39: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 1tA5Lb-00009S-Ff for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5La-0007u0-VX; Sun, 10 Nov 2024 05:39: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=JSdEcX3sZCU76Ep2Xqc0XkFMC0VxBU5XH+XwIzFMQV8=; b=Z+9hRozQVm6H/KCEt+zohSRB5hC+1dxozDa7AYqT6hVioSJOwBKI0df+7NYGwQjaWO9a7LMk8NAVIPp6NmaBdc2PfHnuqHW6I2M3RpgmYt0E85haUnFwX5rhabQSQBKJZCuBzf4X4WLDvyulEEJqNz8M1M7rknCP8sgm4Pd/kKLemoxE/osJc0SJy5sI9VkRmDzfoihcLqxbI8CWtpctGvIfZ9ZV95CM1DssBjzfeG1icC9+niP0oSmYDuK0bv/0MfAP4islbl9YeEhznhVy0TUT337JvmbxXOvOEN3JYNzFS+fHG3raNFXxDOqtKLOrJg4gGkt6bbyI1Z8YMT2t4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LW-0002am-7L; Sun, 10 Nov 2024 05:39:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 05/31] 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, 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, 10 Nov 2024 10:39: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 , 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.17312351409872 (code B ref 74290); Sun, 10 Nov 2024 10:39:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:00 +0000 Received: from localhost ([127.0.0.1]:55689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Yi-PR for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LH-0002Wz-Kr for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LC-0007mW-Es; Sun, 10 Nov 2024 05:38: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=JSdEcX3sZCU76Ep2Xqc0XkFMC0VxBU5XH+XwIzFMQV8=; b=Dd5zI04S4ScisUo6mISQ tfsr7Vdz8G/BP9eR2mSo1i2gJrLHVfywVB242Ah7Q+35oz8bInvDS/VnBYuw15HfrSGf6872ejLXx TocMkAwH8A/kA7rcDBOfZQdr+zRDUUIdvd9RJszMzz/moiF7hMBFu1N0JdXaxz09B05By9s2d5PZu kcfnJ7OlQ+KlXZPF4IrXnM9DlrrD0AJibsjyEgk5rse9Ybo2Cn9Z15t2Rzb0Am1Um51Oaq8b5V3nD 0VXI3tQeFmBhWVnrNI1SGZTmCC5ZY8V/qv7DHPnwu2qHC5J6ylD60pGnCDwKeEnw8KvLKSA22zll3 1ybxgQRVvZYL5A==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:01 +0100 Message-ID: <41db48275160489ce01568c14a301d2724e5f4f4.1731232753.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. * guix/platforms/x86.scm (x86_64-gnu): New exported variable. * guix/utils.scm (target-hurd64? system-hurd64?): New procedures. * gnu/packages/gcc.scm: (current-gcc): Use target-hurd64? in new procedure to select gcc-14 on 64bit Hurd. (libstdc++): Change to procedure. (libstdc++-headers): Update accordingly. * gnu/packages/commencement.scm (current-gcc-toolchain): Likewise, to select gcc-toolchain-14 on 64bit Hurd. * gnu/packages/cross-base.scm (%xgcc): Use current-gcc. (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): Capture (current-gcc) before resetting %current-target-system. [native-inputs]: Move final-inputs before cross-packages. (%glibc-stripped): Likewise. (%gcc-static): Change to procedure. (%gcc-stripped): Likewise, update accordingly. (%gcc-bootstrap-tarball): Likewise, update accordingly. * gnu/ci.scm (%core-packages): Update accordingly. * gnu/packages/patches/gcc-14-cross-without-bootstrap.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cross-base.scm (cross-gcc)[origin]: Use it when cross-building gcc >= 14. Change-Id: I4ae189e7e5188ced91744b89fe9d753b6a1fca78 --- gnu/ci.scm | 4 ++-- gnu/packages/commencement.scm | 6 +++-- gnu/packages/cross-base.scm | 6 ++--- gnu/packages/gcc.scm | 32 +++++++++++++------------- gnu/packages/make-bootstrap.scm | 40 +++++++++++++++++++++------------ guix/platforms/x86.scm | 11 ++++++++- guix/utils.scm | 15 ++++++++++++- 7 files changed, 76 insertions(+), 38 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index 4e282d197f..e7e839d968 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012-2024 Ludovic Courtès -;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020, 2021 Mathieu Othacehe @@ -146,7 +146,7 @@ (define %core-packages %bootstrap-binaries-tarball %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) - %gcc-bootstrap-tarball + (%gcc-bootstrap-tarball) %guile-bootstrap-tarball %bootstrap-tarballs)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2b43759dac..682deb89cf 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,10 +3642,12 @@ (define-public gcc-toolchain-14 ;; The default GCC (define (current-gcc-toolchain) "The current default gcc-toolchain version." - gcc-toolchain-11) + (if (target-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain - (deprecated-package "gcc-toolchain" gcc-toolchain-11)) + (deprecated-package "gcc-toolchain" (current-gcc-toolchain))) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9c701efae8..7b32a6b64e 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/gcc.scm b/gnu/packages/gcc.scm index 3b5d05b9a9..fc3746fb05 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -861,10 +861,12 @@ (define-public gcc-14 ;; the gcc-toolchain-* definitions. (define (current-gcc) "The current default gcc version." - gcc-11) + (if (target-hurd64?) + gcc-14 + gcc-11)) (define-public gcc - (deprecated-package "gcc" gcc-11)) + (deprecated-package "gcc" (current-gcc))) ;;; @@ -903,15 +905,15 @@ (define-public gcc-2.95 (outputs '("out")) (arguments (let ((matching-system - (match (%current-system) - ;; This package predates our 64-bit architectures. - ;; Force a 32-bit build targeting a similar architecture. - ("aarch64-linux" - "armhf-linux") - ("x86_64-linux" - "i686-linux") - (_ - (%current-system))))) + (match (%current-system) + ;; This package predates our 64-bit architectures. + ;; Force a 32-bit build targeting a similar architecture. + ("aarch64-linux" + "armhf-linux") + ("x86_64-linux" + "i686-linux") + (_ + (%current-system))))) (list #:system matching-system #:configure-flags #~'("--disable-werror") @@ -1050,8 +1052,8 @@ (define-public (make-libstdc++ gcc) (propagated-inputs '()) (synopsis "GNU C++ standard library"))) -(define libstdc++ - ;; Libstdc++ matching the default GCC. +(define (current-libstdc++) + ;; Libstdc++ matching the CURRENT-GCC. (make-libstdc++ (current-gcc))) (define libstdc++-headers @@ -1061,7 +1063,7 @@ (define libstdc++-headers ;; is right under include/c++ and not under ;; include/c++/x86_64-unknown-linux-gnu (aka. GPLUSPLUS_TOOL_INCLUDE_DIR). (package - (inherit libstdc++) + (inherit (current-libstdc++)) (name "libstdc++-headers") (outputs '("out")) (build-system trivial-build-system) @@ -1072,7 +1074,7 @@ (define libstdc++-headers (mkdir (string-append out "/include")) (symlink (string-append libstdc++ "/include") (string-append out "/include/c++"))))) - (inputs `(("libstdc++" ,libstdc++))) + (inputs `(("libstdc++" ,(current-libstdc++)))) (synopsis "Headers of GNU libstdc++"))) (define-public libstdc++-4.9 diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index c6293b9a38..18281198ba 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -124,8 +124,11 @@ (define (package-with-relocatable-glibc p) (glibc-for-bootstrap ;; `cross-libc' already returns a cross libc, so clear ;; %CURRENT-TARGET-SYSTEM. - (parameterize ((%current-target-system #f)) - (cross-libc target)))) + (let ((xgcc (cross-gcc target #:xgcc (current-gcc)))) + (parameterize ((%current-target-system #f)) + (cross-libc target #:xgcc xgcc + #:xheaders (cross-kernel-headers + target #:xgcc xgcc)))))) ;; Standard inputs with the above libc and corresponding GCC. @@ -145,7 +148,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 +160,7 @@ (define (package-with-relocatable-glibc p) (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) (package-search-paths (current-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)) @@ -446,7 +451,8 @@ (define (%glibc-stripped) ;; GNU libc's essential shared libraries, dynamic linker, and headers, ;; with all references to store directories stripped. As a result, ;; libc.so is unusable and need to be patched for proper relocation. - (let ((glibc (glibc-for-bootstrap glibc))) + (let ((glibc (glibc-for-bootstrap glibc)) + (gcc (current-gcc))) (package (inherit glibc) (name "glibc-stripped") (build-system trivial-build-system) @@ -463,8 +469,13 @@ (define (%glibc-stripped) `(("libc" ,(let ((target (%current-target-system))) (if target (glibc-for-bootstrap - (parameterize ((%current-target-system #f)) - (cross-libc target))) + (let* ((xgcc (cross-gcc target #:xgcc gcc)) + (xheaders (cross-kernel-headers target + #:xgcc xgcc))) + (parameterize ((%current-target-system #f)) + (cross-libc target + #:xgcc xgcc + #:xheaders xheaders)))) glibc))))) (inputs `(("kernel-headers" @@ -478,11 +489,12 @@ (define (%glibc-stripped) ;; Only one output. (outputs '("out"))))) -(define %gcc-static +(define (%gcc-static) ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc (package (inherit (current-gcc)) (name "gcc-static") + (source (package-source (current-gcc))) (outputs '("out")) ; all in one (arguments (substitute-keyword-arguments (package-arguments (current-gcc)) @@ -552,7 +564,7 @@ (define %gcc-static ,@(package-native-inputs (current-gcc))) (package-native-inputs (current-gcc))))))) -(define %gcc-stripped +(define (%gcc-stripped) ;; The subset of GCC files needed for bootstrap. (package (inherit (current-gcc)) @@ -575,7 +587,7 @@ (define %gcc-stripped (libdir (string-append out "/lib")) (includedir (string-append out "/include")) (libexecdir (string-append out "/libexec")) - (gcc #$%gcc-static)) + (gcc #$(%gcc-static))) (copy-recursively (string-append gcc "/bin") bindir) (for-each remove-store-references (find-files bindir ".*")) @@ -813,9 +825,9 @@ (define (%glibc-bootstrap-tarball) ;; A tarball with GNU libc's shared libraries, dynamic linker, and headers. (tarball-package (%glibc-stripped))) -(define %gcc-bootstrap-tarball +(define (%gcc-bootstrap-tarball) ;; A tarball with a dynamic-linked GCC and its headers. - (tarball-package %gcc-stripped)) + (tarball-package (%gcc-stripped))) (define %guile-bootstrap-tarball ;; A tarball with the statically-linked, relocatable Guile. @@ -856,7 +868,7 @@ (define %bootstrap-tarballs ((or "i686-linux" "x86_64-linux") (list %linux-libre-headers-bootstrap-tarball)) (_ - (list %gcc-bootstrap-tarball + (list (%gcc-bootstrap-tarball) %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) %bootstrap-binaries-tarball))))) 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 10 10:38:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70171 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 0FBD927BBEC; Sun, 10 Nov 2024 10:39: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=-5.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLACK 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 3C69D27BBE9 for ; Sun, 10 Nov 2024 10:39:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5LY-0008V2-TW; Sun, 10 Nov 2024 05:39: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 1tA5LW-0008UV-Qy for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LV-0007sU-OH; Sun, 10 Nov 2024 05:39: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=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=uP9qkO8ovAszkNZ3+UF1sHftYDDLBUj8ujX+HCZ0jC4Bfx0q5j4XYWBn72KsLdO0GxGYzzqPR/cc1zDjeYIRf81PEoGSnveVCc5GLg2XaR7pOaJqNRgXfhJ/swo3BseMCINwIuZvTnH14KM4SQ6AcMrO0DxKk9EE1oNzlrkyw7Umbuh0d10ros9WN98YZKca4/wRTg0WKWoeOghajJjEdnsmgvLUB8I7xM3gT9boRCJ69A16x2BFYnfBnWLiDpF18X8bLjxtgE4TVas26TjzshHnn+C9VD4jEOQcautzByfPt8xtgBtmxDtUQ5kVU4bzbWcrySKC7oo7h8GL5lgouQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002aL-6c; Sun, 10 Nov 2024 05:39:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 06/31] 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, 10 Nov 2024 10:39: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 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.17312351399844 (code B ref 74290); Sun, 10 Nov 2024 10:39:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:59 +0000 Received: from localhost ([127.0.0.1]:55687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Ye-7I for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LI-0002X1-Mw for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LD-0007nQ-H3; Sun, 10 Nov 2024 05:38: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=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=DcX1d/5FWO8fEIL7UFmB zfPLeTWEQJhAu72lqzrDT2yJ5obvWfrJtLRW9lTu5mMNAtsZxmQZ3X7bBuORPGQtx2DCKW9NgtTia zGnwnITNWD79IivB9Ev1a71h7qE9eqtv93yXAYf3rwbcAmf5INEEXbebJoSs0fBiOyvTRrxqoCSp6 j9XbGKPsnNlhp+T9y45knjVBedLgYtpxVxowrxcjBifPSRZVHkikqFP7U90OVs3PGglf2O8NMRfmM CEBatdgqK1SzKoB7Ph4X7fpk0rEd7ohz5fWGiyGPXgupqgn8hKse5biiO97jlUAipa+Tmx/Sp+/Xc ard8pXU3fCkXJg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:02 +0100 Message-ID: <5d540a65fb1897c844300061df1eb72ec630c4b8.1731232753.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 | 18 ++++++++++++------ gnu/packages/cross-base.scm | 17 +++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4e8121ae2c..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") @@ -1088,11 +1088,17 @@ (define-public glibc " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (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) + (symlink cpu machine)))))) '())))) (inputs `(("static-bash" ,static-bash))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 7b32a6b64e..3827e87aec 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") @@ -747,11 +747,16 @@ (define* (cross-libc* target " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) + (machine (string-append + out "/include/mach/machine"))) + (unless (file-exists? machine) + (symlink cpu machine)))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the From patchwork Sun Nov 10 10:38: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: 70175 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 21A7627BBEA; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 CBC9827BBE2 for ; Sun, 10 Nov 2024 10:39:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Lv-0000Ns-Oy; Sun, 10 Nov 2024 05:39:31 -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 1tA5LX-0008Uf-Fs for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LX-0007sy-6e for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=ZxI/gq58eWCTS4TrSRJVe5AfDbAQNW+5TBQK2EriJ8w=; b=K5TtWWngmy4S8ECG5LKr7p2bAECTXXt4FjwlA1DQLEWirHIPaC3J8PWuW4s0ykSOhbDT0cB9IgpOeGg1oCoau3cFez+pBLx5uD8SVcxwJmc7Es12I6EvP0lcPXXfz/Zfk7zKnnCunZR9uWxCyzRBab3xn5GPnShca6jpQy8tLFx5O21RQQ5xe6Mel+Rryi7ivVOP66ws5t983emA1jmhRWRgxMk1lCxqjIsSWFojsWIC7+IrbJJCrQbWqLlPmorkO7RPmjJpnavOwK3AJN2Edh2Yvf6BmD/HuIfYWfNAvuuNcOrvZqNwHzOJajbr1xEmZY2w8IAET1dY5kgMbhWlIQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LX-0002b2-0H for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 07/31] gnu: bash-minimal: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351419884 (code B ref 74290); Sun, 10 Nov 2024 10:39:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:01 +0000 Received: from localhost ([127.0.0.1]:55695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LQ-0002ZB-Eu for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LJ-0002X5-Qq for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LE-0007nd-Kr; Sun, 10 Nov 2024 05:38: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=ZxI/gq58eWCTS4TrSRJVe5AfDbAQNW+5TBQK2EriJ8w=; b=iBc/okg+o6wRCrngouyF BSqh5R12HAfyxmy4MmQS/sz/1k8/PAbfePpKcx2fYF1QMvwNRW7YEXee3ppCYUjJn/pKk2sX0XlO2 ccMFiBLAuLQulicXbGh/FQFf7yircNVREOmcd+2Na1xN2I/l5sc74mnEzMYoR1OIw4Sx2jHqskT12 4dzIwr1lHLvecJBFRgtL4gpx14O9EQUJxGbIPZS008stInpgHVHO/7vp1+lEpLkOrY3BrnwoHINid zUUkFvdxfKovzQUZ2VDBJ4IpPRnoecn84ge7eocKNyNl8YMFoA4O3ktp6fn6a52mgLaiyopKzmrhj UmXlXd8MdR6CSg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:03 +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/bash-minimal.scm (bash)[arguments]: When building with gcc >= 14 use "CFLAGS=-Wno-implicit-function-declaration". Change-Id: I3fd2da7a1d9011b155084dceadbad649dbb2a1b9 --- gnu/packages/bash.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 93641a78d5..1a3b014ad7 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. ;;; @@ -30,6 +31,7 @@ (define-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages elf) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) @@ -251,6 +253,13 @@ (define-public bash-minimal ;; modules and related code. "ac_cv_func_dlopen=no" + ,@(if (version>=? (package-version (current-gcc)) "14") + ;; gcc-14 implictly uses -Wimplicit-function-declaration + ;; which together with -Werror causes: + ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’; + '("CFLAGS=-Wno-implicit-function-declaration") + '()) + ,@(if (%current-target-system) '("bash_cv_job_control_missing=no" "bash_cv_getcwd_malloc=yes") From patchwork Sun Nov 10 10:38:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70173 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 8339A27BBE2; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 3896027BBE2 for ; Sun, 10 Nov 2024 10:39:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Lb-00008h-72; Sun, 10 Nov 2024 05:39:11 -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 1tA5LZ-0008VP-It for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LZ-0007tQ-AI for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=cF6ikUut8co2WzQ8hrEHqPCHeXj3NYg53KJsM6rMXCM=; b=Vkg0I6n1+dO3BDrMMLJKAQ5PKSld1oEZSw/Oh9NlG5UffNeP9wwbnB9DAWgK6ffx7c/Tg5ZwL5vG2pOgw13sLSl6SnRi467C/XqSjy1OcmuPFN6zk9jyCOqAVMp/ohq4tonvs7g5iUKw+ndLaUEI/7y8kpNrrapgTf0mkv4hYhWut48Q/VVcCDc+0YBTIaEbAQ1AKELGqhaGKQcwZYY0ehbDI3qNpv6P4Id/hp92qGifoXRl5KeatTWGVO/PNm/TZdu7xLV2K2cW3tD7vysAmpP2zR4sgqCKlCvVl9xkfaYvjrdh/c9eU4nSGv8OlBvFluNkgZ8aMghPxkhToQDv1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LZ-0002be-3c for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 08/31] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351469958 (code B ref 74290); Sun, 10 Nov 2024 10:39:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:06 +0000 Received: from localhost ([127.0.0.1]:55708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LU-0002aE-Rw for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LL-0002XA-03 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LF-0007nl-Pv; Sun, 10 Nov 2024 05:38: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=cF6ikUut8co2WzQ8hrEHqPCHeXj3NYg53KJsM6rMXCM=; b=IPb8hafcbYQo0pmn1P4u SnlFFngfZRPruy3jy/SbIhUfX7bfJLo/c6A13dQ3dUG8epPVPvj1ouPO/1gzIAvumsGLD2MelQ+2P jF655nlf548ZrOlYb+RoooZ2HmuoZSppEBmjq/cKytvAIoywFGcRdZZVo4ISzHIeXmPVmEVl6AMZz xuzkCQzsglNBiMJMgX0eBrKRlljfHTg1BXESKj/9A5J+0aqUcuOt7iNTBvKEbLcLnStON1Q9LFbDz n4pNfh5CtdxFErDRfNxNJO/J5OALJHndjh/Csudjt5WoViOyMTuwE7OJK7+T/Z/i6bcWJL6Ty3MZK 0aNNisLTNaMGIA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:04 +0100 Message-ID: <3112163cbeb58f04bff54368364741ae8a16cdcc.1731232753.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/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 10 10:38:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70177 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 CC9A227BBE9; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 6CC5C27BBE2 for ; Sun, 10 Nov 2024 10:39:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Ly-0000Q6-3L; Sun, 10 Nov 2024 05:39:34 -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 1tA5La-00008U-Va for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5La-0007th-8Q; Sun, 10 Nov 2024 05:39: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=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=cYz8qxc+2jOW16bC2SsnGdzmzFRuVqfUkx/sRDlDpKXr3agGv13VV7YLWe5c4Ik35ykNNpYsf3g2Xot+XoZk/ud37mfR1FPsSyjF45YRStMo9Wcqjwj5MbB9HQE1sWLGIYJALZ93il31gsVVXrLHXgF1O6jXjMlajpKPu+GMp+1UbsH+fN5epT7iMxTsAZ9N9H3DyMg53LsFWEclVyNx/NM7B7+iOOau1pEFxpMIQzAdFeC4EaMyp8roWxe4Th87EV9AzSfrRr3Ai+cASstR+Syw0BujKz5jA6YURYWGohU6tqWztb0Hspf/K0f0lX54uCsWg9UfH3Oy8XjhOHPbpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5La-0002by-0w; Sun, 10 Nov 2024 05:39:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 09/31] 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, 10 Nov 2024 10:39: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 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.17312351469977 (code B ref 74290); Sun, 10 Nov 2024 10:39:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:06 +0000 Received: from localhost ([127.0.0.1]:55714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002aY-Pd for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LL-0002XR-Ua for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LG-0007o9-OF; Sun, 10 Nov 2024 05:38: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=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=VhuMbHSX0X3DYs1KOFJk TRkfOjtlcsoSMOQwlVHb7nr5pjW65vBBfonh1m+m8GfhXJ2B/vJeEmGBzp2H/pmmh6F1sj7M+Y/yR TB2ZV//fCn2OIZcG99lYQ4RJHODBAB/fRLj6iHJCnpmsJGtrzXbdmz8Re54qMZVWM2pm30/gO6Ic9 8sJC8J4G6Q+hxJTnEzxE37/GMB1LKIWxy5XuMo6Hc+qooc3CN+oBVPJcQ69bue31/Mxgs/W0EKs8k RdauEjoHdr9n0Xi58i6uZ48ToAxZ+iBdoynlpK/LiwqBGUHJE7Hl5awPTVl/PX+inSY4hre+XV/GO 0bOhRahHC+1PWA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:05 +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/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 10 10:38: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: 70170 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 CF11F27BBEA; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 4A71F27BBE2 for ; Sun, 10 Nov 2024 10:39:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Le-0000BC-IE; Sun, 10 Nov 2024 05:39:14 -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 1tA5Lb-00008g-1W for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5La-0007tn-OV; Sun, 10 Nov 2024 05:39: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=5ExfrZ/+CdYW3gc0CTweztCEeJigx1+cn3xK+mVuZAM=; b=F+Cm7Vm07TO/7c4nuF2mqoDztFAISWn/52CpOSzfXdPmOh7yX7tlY54Q8Ra6aLv/+wlqNx771B0Je+CfbfT0U4L3xFvSsMUi2Rhb7hscUvTAIwWtqszOGfLTjMPMYRkzplfRt+7A7FCoHpnti7OLN54baWfwYtgXdUGSygvSeUiiRVeER4C5KB2vIMYmBCoJkhSAbEeE+tFvMdDXeUEHvfTMcD4ul2+n3RZHviOVUafu2v9KJTaaHN0w2PAmrXNmUQtsaTYFNr7qqG6gvEm7xSCPjzJU9GxIl6fnvB9CdREWxY7LwmDF3/gRkxO9guLXvlkItRogKnl28gBQwyu+Tg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5La-0002cD-KF; Sun, 10 Nov 2024 05:39:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 10/31] 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, 10 Nov 2024 10:39: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 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.173123514710000 (code B ref 74290); Sun, 10 Nov 2024 10:39:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:07 +0000 Received: from localhost ([127.0.0.1]:55716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LW-0002as-Gi for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LN-0002Xb-4A for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LH-0007oQ-NH; Sun, 10 Nov 2024 05:38: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=5ExfrZ/+CdYW3gc0CTweztCEeJigx1+cn3xK+mVuZAM=; b=E2p28313YlPQRYVrpAxj 3XEG41ytd/HGhiq+p4u54xdLAJTee2dHLwPaKu9mGzXO6wW8qImQhmoiVHDohKt4kMECOZQ543w2Z 0exPerg8yKP99mRqrt4KVuEdwYlOHw5eGFy3O9B/bfQ2bUeygAtVK+F1nPEluCp9r6OLFvqyx/L0J mkwNu7Rjk7EhiwmSCr0GFs01s1JTrxTQNm2JcmwW/x3fv+rz1htswoEcy2cfXra5QdDdQJc1iFRGO GVnpwRsmJYwdGfO49UhNEh65jz3IkrPaNt9YyYoorReS1lsg/mk3qbIWeGaCxsJCrm/LfS7ZSSbUS CLepgciIsNoCvw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38: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/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 10 10:38:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70169 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 2C3FF27BBEA; Sun, 10 Nov 2024 10:39: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 6681727BBE2 for ; Sun, 10 Nov 2024 10:39:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Le-0000BQ-KZ; Sun, 10 Nov 2024 05:39:14 -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 1tA5Lb-00009V-Lv for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lb-0007u6-8C for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=daI5/8QpApDIlICItVDTLLDc85FqQzlLlfXDfvjT0zE8oYElEFlvpDgVIdTMwDMqeX/ftM8cb4W+1x3QhxnwfJU9Oerlk2qBIT7lQFlCcTGFNzeGg0HnVYb4AxFNr0Hk6zMTwATb/Q++1nnGPd4+75tlDJVIDE1YvpFjrrpsl0dqBmUgR6yuzTuWLenMDGaNoE9L0TTJHTfWbYtGJR3Esz1HT0fCTirAewhMdGJRpkM12Lq+tWSoXv4lglN4qHG5t94/CMxXO2oe1LD9nvJdGV0Js1RaCHJMRSsbJWFYBJ7U3FEwzHA7XXwpBMtGVKJ2CKwK9DLdpruc9b4CZkBbdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5Lb-0002cO-2A for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 11/31] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.173123514810016 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:08 +0000 Received: from localhost ([127.0.0.1]:55723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LX-0002bC-Fj for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Xl-0m for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LI-0007oZ-Qs; Sun, 10 Nov 2024 05:38: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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=MW7j9MJzPcqFMAohiuCj a/T3fTCJg5hxMHATkFLIuEaBA5W7R+tUCVqnkQmp01oI6qaq6LTLGdnso1ZgxvN6DsWqmuPqJfmeV jvmj7svOYkwJXPZJgmCDnucZXe2OQvry9i9nvgQz8x4Sa+LVGhyWmbVDOv+xP9MJyU1PEBNdclKtH VDm4Pab1l+3GPQDizAvzhFPJMTf8NM8ahbTOoYrCtmxnJA2xbWgirqpnecBT9DxZeDworPiNyhcoF /0uHC3NLF1N++C661RXInetkqpE6qDm1Qo2fA6j6bufLDQxx0m3pni1Ha6lGY75kobc2wMLcqX5Kr FSb6UoHkPyIJKA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:07 +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/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-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 15 ++++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4d3ee9ea35..4b9fa95658 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1725,6 +1725,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2023-5217.patch \ %D%/packages/patches/libvpx-CVE-2023-44488.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..94a98bb0ad 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,20 @@ (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-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file)))))) + '())) (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 10 10:38: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: 70178 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 21B7E27BBEA; Sun, 10 Nov 2024 10:39:55 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 A0A5327BBE2 for ; Sun, 10 Nov 2024 10:39:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Lv-0000NW-MY; Sun, 10 Nov 2024 05:39:31 -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 1tA5Lc-0000A6-Af for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lc-0007uW-16; Sun, 10 Nov 2024 05:39:12 -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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=A5b2a6KL2BN6QjjL1IWqr0KpjhPxNy9xof3UfXqJ2pCl4Ca/h1FoIxuyyB7CR2kBQ/bgqinfnXdHKW9Z3LQAzNCWVsFkydPszskKXt1e7mJYb1vL9AnsRqk+zf0ARNt2GLmGuwxsslMEcNXg6R7sdeOuTXNyYq5IOls50HpmeBm/zgTPHFsgwv+BOJxRHWe4TlHsqQn05cMWRT0hcDgjgK3+4adDtusWlVdILSCiuOfuiWHtBzgM3pqggp2AVVE6fhv0e8JicLmrm0HlfRzLSiPCDOtgu65rQeDNVUxWvQqvSx4ZDEBvHLiF35S4oip0sQ4kPSx6FEu4zvKRrqastA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5Lb-0002cY-P3; Sun, 10 Nov 2024 05:39:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 12/31] 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, 10 Nov 2024 10:39: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 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.173123514910039 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:09 +0000 Received: from localhost ([127.0.0.1]:55729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LY-0002ba-Lv for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LP-0002Xy-5e for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:59 -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 1tA5LJ-0007oj-W2; Sun, 10 Nov 2024 05:38:54 -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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=W1DffoPOX/WepIvXC+49 C183Ks44I6D28EVBOPDd+nrpI1RVNaRoeVzv1TWUeepAVYL/aDhEjXaKGuPIst1qDGz5+B6mAxeEC npTwIw9K/sy0HoUy1h6KFiqxHcOWUkTfEnkN0+TTmRGQyJFq4oHlPJECK8IDtwAEXrC0HoQL+0tpk 4+enqP/e6QbWAXlOO9IS2p+pw1M4XfeE0siUIXa/rtiUWwD+JXf/Z05yPSJ85bLMvd58eNA1TYeeA 9fU0oEzInYUhfc0ftZ6gIU8G6WkCMsW9oXGCDmejEAKDtWJ3/YbYX/OHwbTit9DM68Y8eAxBw990M rywLEmVOBoAR/w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:08 +0100 Message-ID: <1351fabb950e28169511b86e1e85fc197eac1674.1731232753.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 fc3746fb05..850a14cb1c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1033,7 +1033,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 10 10:38: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: 70182 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 A176227BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 5C07627BBE2 for ; Sun, 10 Nov 2024 10:40:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MS-0000tF-Au; Sun, 10 Nov 2024 05:40: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 1tA5MQ-0000sD-K0 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MQ-00083R-AT; Sun, 10 Nov 2024 05:40: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=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=VY1Xg+FJLfj91ZXvWECiH7Xn714h2VViV8ChTHyukp8uYaXRexIF7X/JztOBTCExHrZsW5g+Df58MzsniGieIuzLujGNK8kgroyUkfN4y81/aZDyXGbxLEp8B0bHatOJrOs9AtjvaeGdR+8EW+d7w9ftvXUu0yKlbu227/wUUjZkmSprM3C55ecnd+bYydtVNClXRjnUmgJUABpzxEM36yyUrZ9IHKzYhdc25P+wR7US8MjBDZ/CR5rh9mLI6+a028e+t+t3I1nYSjNJvN5450QIsSV7Y8tp7OQpKr2sRcILeLedxFIKoPzqFK9HxRmddhbJ/xNIyu8iLaVIc+0H0w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MQ-0002hR-5P; Sun, 10 Nov 2024 05:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 13/31] gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123515910151 (code B ref 74290); Sun, 10 Nov 2024 10:40:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:19 +0000 Received: from localhost ([127.0.0.1]:55761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002de-K8 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LQ-0002YA-8L for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LL-0007ou-2O; Sun, 10 Nov 2024 05:38: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=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=rrWbjEpHoakMK4ZMrc/x /rps4G7/yjEU+UqV5UK1ur8UbwVeCNXW5L/Kx0NWUtKG0zQOt6MvFXk487YGNNbCUYwB5qU0OlxO2 axDpGbZwqn14J9GmQkhdzUxXdvif+VUIhpuMuiYEqBa13Ni3RkgOIa7WbsABVJZJFHzq8d8HRU4Od kdhROTJ+SjZltp9x4i8dzlBWL+a/fqtXC2Yyc5TUTT3c0POsv6VgFKj7dk5OuKsnlF7JwGLgCscTL DCQxQGpHKGKoKjPuvsJ+6/ly7CnYpgflXzg1KIM0CSm+eGgGytlNynDqQdeZS1Wtmw6oFhOc5AXaw pkghNkH6X3VvtQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:09 +0100 Message-ID: <7a8acd375aa807b7d4386ed8052aa743261c42ce.1731232753.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-13)[arguments]: Use quasiquote instead of g-expressions. (gcc-14)[arguments]: Likewise. Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 --- gnu/packages/gcc.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 850a14cb1c..befbbda027 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -811,10 +811,10 @@ (define-public gcc-13 (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-11) - ((#:phases phases #~%standard-phases) + ((#:phases phases '%standard-phases) (if (target-hurd?) - #~(modify-phases #$phases - (delete 'patch-hurd-libpthread)) + `(modify-phases ,phases + (delete 'patch-hurd-libpthread)) phases)))) (properties `((compiler-cpu-architectures @@ -841,8 +841,8 @@ (define-public gcc-14 (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-13) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases + ((#:phases phases '%standard-phases) + `(modify-phases ,phases (add-before 'configure 'pre-x86-configure (lambda _ (substitute* "gcc/config/i386/t-linux64" From patchwork Sun Nov 10 10:38: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: 70185 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 0C9E927BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 24A0C27BBE9 for ; Sun, 10 Nov 2024 10:40:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MW-0000zc-Cw; Sun, 10 Nov 2024 05:40: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 1tA5MT-0000vb-Ja for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MT-0008FI-8Z; Sun, 10 Nov 2024 05:40: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=o32zx2obtPDkW7vhpV3sbeZpzRBMk0ENuE3/jKRCM2k=; b=YMplIGt7jvxdxcPY/h8xM7P5HUcVtPZGSymnIiRVXBEwd63am9ME+joOYU11qlHXaExCwB8EzrnlDXH4+ziMYXDVTLV44+rTNiEuP5HNFQMmXzJVl9tkCHeVpbQoMUKhrTLWys0VJBphS6g72FVlINzfVldOenximu8ttdLPvvpiCYjUyu839dny6h0jBN8x7IcucoR03I6WWY4hNu2SqnfoDwXqA30O6rySprSpuIh99gJZwdOy/1M4/OUtVorEtHsIuZpIhZVrq/aedwIzZKBDn+lmwZQfu+Znb8NgVxa+3xZifelMgLmM21GdflKumj7UiXmJWrzQTjKdBC9Ssw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MQ-0002hZ-M9; Sun, 10 Nov 2024 05:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 14/31] 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, 10 Nov 2024 10:40: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 , 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.173123516010161 (code B ref 74290); Sun, 10 Nov 2024 10:40:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:20 +0000 Received: from localhost ([127.0.0.1]:55763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002di-W8 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LR-0002YT-Hl for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LM-0007p9-9l; Sun, 10 Nov 2024 05:38: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=o32zx2obtPDkW7vhpV3sbeZpzRBMk0ENuE3/jKRCM2k=; b=nz5qpzDbjLpL/b8a2uHQ 4rYc0gr7sFNaMBTbwiFFeKIfuKJXj46dXW9OmgdNT+nWcdTmV3taN51HkzdClmnGyPD5YvY+gCKeM aXeWbHWeVY6j4/3dB/rNY6HEXUeRTDm3kzV+p+C5vW9SToaq64/TZsgco1QsKbQaCFT2oPBmJT3Me f9kA8qMRqqqAbtBV6T0I34fdo/slqmrCmTvsRtFhoVqh1ObBio6/cD6bKYuroHjI5jhgAkAupX4oH IdFaOIuaBRMZTlS39AIRC4T/44lvhpE1Jvs5QyR6ZjHVdEuT09hG97anfiPKAtgR34qwxyu8zbU0m Z/dIrVWka43Mcw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:10 +0100 Message-ID: <43e8a79925bda014c70618de24c2936772bb829b.1731232753.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 guix build hello, 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 Update blog post. On commit: 7a8acd375aa807b7d4386ed8052aa743261c42ce gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/sm23f2g91k554w2clcm9l9airwn9gqmz-bootstrap-tarballs-0 With guix hash -r: 1v9ld86vw76drrxlqf0b930644mgj6mgxqak9ybx4h0xsiczxisw * 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: Ic0e09d5b3b035aec27c7274e57cccedee9c0611c --- doc/guix.texi | 9 +++++++- gnu/packages/bootstrap.scm | 42 ++++++++++++++++++++++++++++++++++---- guix/packages.scm | 8 +++++--- m4/guix.m4 | 12 ++++++++--- 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 187bae6898..73692d73d6 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@* @@ -637,6 +637,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 c4640b62e1..eb6a4f1917 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -118,13 +118,22 @@ (define %bootstrap-executables ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) ("i586-gnu" ("bash" - ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg")) + ,(base32 "0nb8ga2j7a4kf6j7pnavq8zf68mj8mhqh26nwkilz1ykj86vg9ml")) ("mkdir" - ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9")) + ,(base32 "0ldsx9pwan40fx2hf4s9d10sfkhvkljvl20hksvm4192p7jb4shp")) ("tar" - ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) + ,(base32 "1z6kfvpwhy14vc52i61v1vzzk3gzxka3db5rlg1jsq6kli35s2ab")) ("xz" - ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) + ,(base32 "1f7g40sk5a6k6qf65k58vlybnnmhyyzczdxy60m3jgcsp674wfcr"))) + ("x86_64-gnu" + ("bash" + ,(base32 "0l0dnighcipvdfbk14q834n57q859i2b9ssiq4bnbh0jpxvvqp1l")) + ("mkdir" + ,(base32 "1nd17k8pwwi7zsqi685w4rn1p2cvfcalrzdhfgwpsk1ilxnmdvsq")) + ("tar" + ,(base32 "0lf94y22ngmxdwhsp0cvj33m23p33r999xnlrff0s1yvlf20w3ks")) + ("xz" + ,(base32 "145aq65rx7w0qk1sw9239888id5ri60ha0xp1kyp6ir3pvizh6by"))) ("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 "/20241110/" 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" + "/20241110/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" @@ -390,6 +402,8 @@ (define (bootstrap-guile-hash system) (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) + ("x86_64-gnu" + (base32 "0fgasmbidp584ibr5fbirmp3wr8qchv84a50i4bichysp00gg26p")) ("powerpc-linux" (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) ("riscv64-linux" @@ -598,6 +612,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" + "/20241110/static-binaries-0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.tar.xz") ("riscv64-linux" @@ -625,6 +641,9 @@ (define %bootstrap-coreutils&co ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) + ("x86_64-gnu" + (base32 + "118s161df8hgrdfph2w5spnrms02rh1dk7mzfvx1k1prvgngpm9p")) ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) @@ -681,6 +700,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" + "/20241110/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.tar.xz") ("riscv64-linux" @@ -711,6 +732,9 @@ (define %bootstrap-binutils ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) + ("x86_64-gnu" + (base32 + "07r74sa7341frhf5a7h1p3pklsrmfpfrf5s8dxm3yz2kqzhish48")) ("powerpc-linux" (base32 "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")) @@ -771,6 +795,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" + "/20241110/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") ("riscv64-linux" @@ -801,6 +827,9 @@ (define %bootstrap-glibc ("i586-gnu" (base32 "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")) + ("x86_64-gnu" + (base32 + "1dcgrnlxbsdic0xmmrjbr8gl6ra5y2xbj8f8jr6y0zvpdyi12ldd")) ("powerpc-linux" (base32 "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) @@ -877,6 +906,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" + "/20241110/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") ("riscv64-linux" @@ -907,6 +938,9 @@ (define %bootstrap-gcc ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) + ("x86_64-gnu" + (base32 + "0vqvjvw6xi16lihiqz4mhisfwx3dgs15y60q07ksdkgvi1wdli2w")) ("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 10 10:38:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70180 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 A4C6927BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 4C11127BBE2 for ; Sun, 10 Nov 2024 10:40:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MT-0000v1-3U; Sun, 10 Nov 2024 05:40: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 1tA5MR-0000so-Nt for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MR-0008Bp-FC for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=/pIhBQFbHM3Hte7KNbqHtKa6WkH0OGOXfOnHnNHczww=; b=vQJc7hWG63rUEVE6N1iJQNmQsVPksoZHwuh2XM9xcrPOPuwdNO0ZlLas+lenBRdpCUpi0jwFQn0TDPD+CWVSAttJSkJ7GQi2F2uXGDcrLNla8TKv0TUifDIquAWzUmk+/uMxMXCDMVM+dPTsHeOYvqeXH7zmjAPzeJlYmquUFaDLi3dfoLcqpVfe+Azvjld+8wmJwHj4YeTFL3TpZtcQGVIfdHxxKQo8WJbfwa7U3kxWdiE8I8Km+e9I6zKfa6TDhbCwD5CQIcepK0edPf0wbpUldlu5QGEFjhexTik4ixlNgiErtCVJ2QunmP7YK5zWsL1NA7oMXl7bargA8Fbosg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MR-0002hl-9Y for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 15/31] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516010171 (code B ref 74290); Sun, 10 Nov 2024 10:40:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:20 +0000 Received: from localhost ([127.0.0.1]:55769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lj-0002dv-Vx for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LS-0002YX-Jp for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LN-0007pZ-Da; Sun, 10 Nov 2024 05:38: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=/pIhBQFbHM3Hte7KNbqHtKa6WkH0OGOXfOnHnNHczww=; b=i5TbD8+FsI+swv5s9TkB TwXTQNQxSAeoBVtwc/P2ptXfBVQaV/RqPAFxPGuAV6+UXHTngi+UhdiECCyVSb0Z7wJK+oJUBu6c/ OsQAfVLghMF+VB5ZsbtcT8uqP5KsXhDpG+EJpttJgzLlc/v/uJfwSDJm7iVMGc/7CIpex8upzQosi T1Yu6vjvwwwTwhyQBWysnEg/f3SDSwnJdwS2LpMRJPvPlWHhAqn0xSBkeD6rj/jg4HGbpuR7pV5IR xY9uBMaNi4YE3AfXu8cyZEq5LkG0dh/ELg59yEAB4x84TcX/nWo5xB1unhcontzdImZNhVMTEmPQZ yl/7vuxnlzYxJg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:11 +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/images/hurd.scm (hurd64-disk-image, hurd64-image-type, hurd64-qcow2-image-type, hurd64-barebones-disk-image, hurd64-barebones-qcow2-image): New variables. Change-Id: I68834a4c5c18b0e154d06082824008d13ca52214 --- gnu/system/images/hurd.scm | 47 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 01c422a54f..75f255ed94 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,13 @@ (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-disk-image + hurd6-image-type + hurd64-qcow2-image-type + hurd64-barebones-disk-image + hurd64-barebones-qcow2-image)) (define hurd-barebones-os (operating-system @@ -115,5 +121,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 hurd-barebones-os x86_64-gnu + #:type hurd64-image-type)) + (name 'hurd64-barebones-disk-image))) + +(define hurd64-barebones-qcow2-image + (image + (inherit + (os+platform->image hurd-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 10 10:38:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70192 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 1B41227BBEA; Sun, 10 Nov 2024 10:41:06 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 C786027BBE9 for ; Sun, 10 Nov 2024 10:41:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mc-00016O-7U; Sun, 10 Nov 2024 05:40:14 -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 1tA5MS-0000tH-A1 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MS-0008F0-0y for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=0Q8BSZH9F1mogIzJkXEZeKbFtAB7kmxUHmYS6qb8Iro=; b=jVWkNTB2L7ZnCON2bYYfgOuPd+rLxgXbfSLOPB5g6W8RTgc1SkKTKx+vLA+nxVGTJoBbEnf/uyQrS8N3xB/owYtQtLL1Z16M2I2b07I6q1KO120Nzu+Gg7rD5QMAFrNbHYOLHciMFJelZbags0aT3CoEOuY2CsEsJ38TsMPUjTw16YexzTzI7dJxsbemV9/bpz/XJ3D4ffaHopuaNd1ml0IdvgKCR35Px/d3ddpu+7SW7wn+gGjKGrX6jcNGLhG2EJ/cOP8MrSWA6kZ64fWs3M+r3QwFa9OCLzRChQ4fLHc43ex1fLzrF5XHDs+qLFwp/CZphiKIfn8DeqADX97TYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MR-0002i5-RN for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 16/31] gnu: Add libgpg-error-1.50. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516110185 (code B ref 74290); Sun, 10 Nov 2024 10:40:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:21 +0000 Received: from localhost ([127.0.0.1]:55771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lk-0002e0-Df for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LU-0002Yu-2h for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LO-0007qL-SW; Sun, 10 Nov 2024 05:38: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=0Q8BSZH9F1mogIzJkXEZeKbFtAB7kmxUHmYS6qb8Iro=; b=gBJz9duuScG8JiFAOjID fqEX1NLBuHI3mVZwCFmxP1dDmMsRUtzkJ7vie+ivulzFrJfQ5gTWj/03+eBlgmFsPse6b+PhlWK8G HiYoyiqid+il6Haba/2PKcoi+4HyaIOLIEY+8x4oc1gYpkVP0zTALbCxvGzM9J7lfh3GbCCmrHy1L caZAWi7qJ/uf+2E2/qpNWZyUn4+nhGBsuer0jAEfvD9ISLKr0YGpFx4Eb6ISFZIrnQCXtWeEobLAz kvzewH/h3LBkEiSVKT/cPG1e2w2gLeQAnHjVNIznEB2+wgk7rdnWYngdKS/80wlKxKadVimRTUwXD l+/Js+iPFwIuxw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:12 +0100 Message-ID: <035b5874f436601f436bcfe480890da38c8ca0c5.1731232753.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/gnupg.scm (libgpg-error-1.50): New variable. Change-Id: Ia34c0f339f331420d76b2c840205f29e511d1dcc --- gnu/packages/gnupg.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..a4863542f2 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. @@ -164,6 +164,19 @@ (define-public libgpg-error (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgpg-error"))))) +(define-public libgpg-error-1.50 + (package + (inherit libgpg-error) + (version "1.50") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" + version ".tar.bz2")) + (sha256 + (base32 + "02p2jgz95688ib28sl4aa624cj0liz73anwcl92f8cx6w14m6h39")))))) + (define-public libgcrypt (package (name "libgcrypt") From patchwork Sun Nov 10 10:38: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: 70179 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 163F527BBE2; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 0B86227BBEB for ; Sun, 10 Nov 2024 10:40:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MV-0000xP-IN; Sun, 10 Nov 2024 05:40: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 1tA5MS-0000uJ-SD for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MS-0008FB-JP for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=6UN3E66LwSQz+zuLe6syFhhjnZVqBglUvR+s+GDG5y4=; b=SFyaicSEPn+I1XiY5bTShLvn2S7CL1ORKQOMr7Bq1h6dr3mcRX4hsxnIG5+psmUMclnQ7h0Gcq/zSKiCjtys0c7e/St6sbvRGVAEz7ycKyT7tecEIvxMLkTYfVyi+TwLQhmFeYtVvrc6Pc7uldTFDPScMjI8sESeQzLJ+/Ak7pHg3huHvHxaAtPkjimb6ULPrReYvgkqRLMbYcihrYy3UcucORVC73Rap904qCAqsjO5znFaffTonS2d1QrasNmvsRJy291wlIK72x3UZeYqoGwGSlbOFwzspArPjE3AZ19awWPs6DdHj0x7scxPlUVWsWPQoF1uT0jixRE3U+Ak6w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MS-0002iZ-Dy for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 17/31] gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516110193 (code B ref 74290); Sun, 10 Nov 2024 10:40:04 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:21 +0000 Received: from localhost ([127.0.0.1]:55773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ll-0002eD-7f for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002Z8-8S for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LQ-0007qv-1j; Sun, 10 Nov 2024 05:39: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=6UN3E66LwSQz+zuLe6syFhhjnZVqBglUvR+s+GDG5y4=; b=DSIb4e7yXDMNFKflov2C Kq3Yy8RaC7dtZtGfkE5pNbsHjJjwYG0M54cgZ3NwD2TE9gPyhCgG0FRbmp6Vm6QdHf9pAKR5nt01a rEo4tfyrHbSn/l4pWRXX4ls0WvO0djuVOGfxxsdLyUqaBYSoEUiMyy++ukO+iI+lQbiwJ33tBr5ko i2vP/kxgUVr/l57r8tXE/NaLxoUxiqrLCHl5yGvH6jJ+GWi2UyMum0VKnmme/9FRLaXRKzv+CUj0B edC2R/x7ThdtKXpwEYUT6gpw0iZwGayDyo4ZVRDIWVLCvts0s6Hn7O2yILL9J0McJu8ZRW7DX0uAk r5snbAPxO05qHA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:13 +0100 Message-ID: <668ec237bdfe5be3c277094abd035fbbf7d07c2c.1731232753.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/gnupg.scm (libgcrypt)[propagated-inputs]: When building for the 64bit Hurd, use libgcrypt-1.50. Change-Id: I608d283a4a307527d5b09a81fa1a53cec5d6bb76 --- gnu/packages/gnupg.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a4863542f2..6c6efff026 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -190,7 +190,9 @@ (define-public libgcrypt "1pp9zyx02bzgzjzldxf0mx9kp3530xgaaqcz4n2cv100ddaaw57g")))) (build-system gnu-build-system) (propagated-inputs - `(("libgpg-error-host" ,libgpg-error))) + `(("libgpg-error-host" ,(if (target-hurd64?) + libgpg-error-1.50 + libgpg-error)))) (native-inputs ;; Needed here for the 'gpg-error' program. `(("libgpg-error-native" ,libgpg-error))) From patchwork Sun Nov 10 10:38: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: 70188 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 5340227BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 0D25D27BBE2 for ; Sun, 10 Nov 2024 10:40:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MW-0000yB-4Y; Sun, 10 Nov 2024 05:40: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 1tA5MT-0000vX-JN for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MT-0008FK-97 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=P/MMktGnhzYi8k7FGo8p1orL+OxYAsbOhgD6lzSd7YU=; b=o+qAqSNAhZEU16rV/dPtpNgKGvV3M1MXvL+qNMSJP/+clqp6mOdRfKZeCc2pmkv0YVcLJW55UIOyHhsd2VKgXgNygANGq4ZLLnQLD7G8mqWKfACTkcgneoAL4QJjKzgIEuxKTCzr3344TcCleNqZDLOS1kS+HgE+bDC46cxpYED0vchp/YCGxKS/Mh6V9Q61leHh5PV1Cf7xXdb9E/AN3KSsNgfwz0TrHldiVs48OZHR/UPhucDlCeIu/I3uhKPcB8UYys/5Iy8Z/4f6PsXlb7vDlIQ5PD3DW06Kusc0En3uGvUPsRxChL3XP/RbrOa0/cGaa1N6TC7qsiGuCCkDnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MT-0002il-4e for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 18/31] gnu: perl: Support cross-building for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516210200 (code B ref 74290); Sun, 10 Nov 2024 10:40:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:22 +0000 Received: from localhost ([127.0.0.1]:55776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ll-0002eL-Jr for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LW-0002ZY-NP for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:07 -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 1tA5LR-0007rJ-8s; Sun, 10 Nov 2024 05:39: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=P/MMktGnhzYi8k7FGo8p1orL+OxYAsbOhgD6lzSd7YU=; b=A3DpGqd3uHWEo4Ds+TDN GfCclGd3lJevcs6Tw8ty4dK/JbfWEsXzAXUDBVfSbAXWs1LkGhC2jOKQPdkwZRsObg+DQ49gn4DOg fpM77stP/bPjVnhRDWtrjpkb9Hev8joOepmwgEAOsgtjMajisEXJx4lzm/grlpzucyOimtYkjdg8Q wD/VDue/19o9mnezgM8sULpAN21J0MMI+s/RD8rwJM1CrRFHja389Xb2yu+bl4WScwZPkPOsnAcIN Rx/TVodMo+aTtrxMu8uORqfz8Aql+oCx2FXBNwJ3xrJbT8yuZXC6tqErVpUuXwESR6G28QBOCfUrl Ve82KbOrjMfNlQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:14 +0100 Message-ID: <05a9e4531639c0b21f2cb936d9fd605539360315.1731232753.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/cross-base.scm (perl)[native-inputs]: When cross-building for the 64bit Hurd, use perl-cross-1.6. Change-Id: I4a77f51a6757ad4aed9bcca8f9bbbf2cbd162e15 --- gnu/packages/perl.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index faaac13bf1..2ea7c49419 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -248,14 +248,18 @@ (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 (if (target-hurd64?) "1.6" "1.4")) + (hash + (if (target-hurd64?) + "0s06lkx5b79r9cn6pm5p6d4jbdjq7wg7rjr75nw5xdhw1z3wnl2d" + "1ydjvlhrk06ccyj4bm8by7xk90krsll2k380mc3x1mhfrc7r9gzy"))) + (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 hash)))))) '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") From patchwork Sun Nov 10 10:38:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70186 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 0D8EC27BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 5F81027BBE2 for ; Sun, 10 Nov 2024 10:40:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MY-00010y-4P; Sun, 10 Nov 2024 05:40:10 -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 1tA5MV-0000xS-8x for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MT-0008FZ-Pp for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=jag5tGRDudH0E+YqI26kJk8f3oBdkf5utn/p9fD/kBc=; b=dSmf4IkToTzKQC1OG1vXb6kn+VqfGBgaveIwvpYM1DQ3hKwTsnPnW4OyZbKxQEHRzHYs8xwb3OwbEpZmBjnxGIse4uF60IIOJD6YcaCa9hpvEKpQYoOXSjz1H4r6cQBpcH80fxX1B2JDg0hSTxcihsUmUnUklu9pzu7d7/XL/lpUmsToKfO5fCE1jEKixTcd2RMmK/NaOhUa2tdUynOmFW3NQdpV90pazWKWchQyGCOYktQqFRZB07pUnsQXaDXnz8hAfGrjpfFhlKlg7xxAemcxxpVR7LVATW3icDIrqaJUH9FSWMXNS+4zSjyoshV59zFnkiGg2iofzKdJdHolcw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MT-0002jJ-LQ for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 19/31] 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, 10 Nov 2024 10:40: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.173123516310214 (code B ref 74290); Sun, 10 Nov 2024 10:40:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:23 +0000 Received: from localhost ([127.0.0.1]:55780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002eT-2O for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LX-0002Zk-TZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LS-0007rX-FX; Sun, 10 Nov 2024 05:39: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=jag5tGRDudH0E+YqI26kJk8f3oBdkf5utn/p9fD/kBc=; b=qAaNxZIEBlJ0kMWoTmL6 hPr3rBRTjegPXkCielWg8fi0H4a15vpuQzHndgXbGfBnoTClAg7oxq5/FoFtMXAeT1gSnZkWh1Ht/ ydGIudA2IROEY9/oRdDGrX7zd+Vs3isK6gCVqzDSLXdenp1i1ExDY4eXUh7H+wSwjyXMCswBTJrWQ I+v2XFxoChZ8zquDPoqexnqnyiGeK2lqdMiRq8Q/N9hnSjWh1b2ZNVtAUWczYcX6yk87JJXfrrrR6 Zt85UJ8mFRv9CGSMOWvFx55Q7AYcSjwzIU0S7tXwXD/Blcp90rjXl6Befw/z03HAJ83TnDNV9JNFg U16BVuzWInU8zg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:15 +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/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 4b9fa95658..576f60579e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1891,6 +1891,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 1a1ce0d215..261a063090 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 10 10:38:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70191 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 49A7727BBE9; Sun, 10 Nov 2024 10:41:02 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 D980A27BBE2 for ; Sun, 10 Nov 2024 10:41:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MW-00010K-UR; Sun, 10 Nov 2024 05:40: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 1tA5MV-0000xT-8x for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MU-0008Fb-Dx for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=m1a3mLpb/3ylbilza/nwuoQcqT33G4s02pDvsTGoLhI=; b=iQWuNspueJM1iEo8oEJJl6I2ODN/9y9PkmT5pr6w/6brnPfsYm49J3Aq62e/fgG+9lj0vLk9xwKHDK7ax9hUZ+Yz+GBIM6G2KYzZqiIyMVc+LILvzWbudO+enBS0EziBT4My2+i6RIBnXgKLCHhQ27nEr3/UepFHrTiiNQfAvOzA4AgKUGna4dOVFMB8sNspaQOrXdL1UMGo2ZuVeRgk2UHcZN0DxBA4l2rPXEs/qq8JW1uAPwQ0jH0kgnGBKh0buNFhCDBK0de8DhfPRLXT5wqSZSPDqyZ7pHgI0ERJWEghNVZiQiqYJEY/XnH/Mt4JP07HdRRuO1ZhsR5SSBE3Wg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MU-0002ju-93 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 20/31] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516310222 (code B ref 74290); Sun, 10 Nov 2024 10:40:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:23 +0000 Received: from localhost ([127.0.0.1]:55783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002eh-W1 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LY-0002Zy-PZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:10 -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 1tA5LT-0007s4-JB; Sun, 10 Nov 2024 05:39: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=m1a3mLpb/3ylbilza/nwuoQcqT33G4s02pDvsTGoLhI=; b=JagVNS3fpcfHh/Gg5bfV pn8RNIalQ+/4dcfp3qkVaBS1npJxmRWAWBElfr2ZSTjPVm9jWxOeE6EPRxCWFn8ZkqUbcPnHTrZqj wk45hHcOClUJ55pxXgP41MVSBkxL3l/hpM3ae62z+dWlphZaxMkGrL7xIM1gRL3EXv+3c43E8s8AV x0k5402AnNbl7jIaUvoCeSuC6VMkQzNSATtfF45+2Xjr4DZ1iPKEO75VHEn6mxJKwG/Xy6d6ZTVbN Ne55d1cou2qAWuYmQfLuK9jXIAQOVrjfUydwxHTzamq0XjbYQllLcJ5rcLFxPz7khIgJb2fhW1cyE DgrmU7sNmQDZGA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:16 +0100 Message-ID: <93bbee8b3e815afc25b5c833498b4f0e1d339827.1731232753.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/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 576f60579e..ad18f62eb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1906,6 +1906,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 10 10:38:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70184 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 A588D27BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 E173327BBE2 for ; Sun, 10 Nov 2024 10:40:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Md-00016d-7p; Sun, 10 Nov 2024 05:40: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 1tA5MV-0000xU-9h for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MU-0008Fi-Vl for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=ch8tBl4fasBJAVNsmWjKzbKyQX4t7oVC9lkF79yxYtg=; b=SE9BaTmG0i2D3PzpsqbjglRVwug5VkVJb0k/vYsth380yccGVK1rMlikH6PhFwk7PWqNCgBSCjwVAevOavZA0nG3LPmeSGte3AP5u7R0Le6CdGcdkuvt5fIFt0qV+2aeawb8QP+mFnozHdtoFZRDjjAqgdIxPmg9zCY48PpqrgF6jwhMmZzgNQFSzNVWa6Jop/xGdD8Xv5hebHTGUW79v2awYwNupCW7bn6qNXCLFXKXJU6w7945R4okPSsR5cfLMUHGGuzq7I42vQ+ZJoPZVct9MuLv+Ae6izzg+FlLmIMaspG6XGzE9kg6Dp+uPblyrf6Pcnmc488qsko8cxXCqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MU-0002k8-Qb for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 21/31] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516410231 (code B ref 74290); Sun, 10 Nov 2024 10:40:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:24 +0000 Received: from localhost ([127.0.0.1]:55785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ln-0002eo-KF for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5La-0002ae-Tv for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:11 -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 1tA5LV-0007sS-Mk; Sun, 10 Nov 2024 05:39:05 -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=ch8tBl4fasBJAVNsmWjKzbKyQX4t7oVC9lkF79yxYtg=; b=D/oXMBXwA8rxzMeRfYSn OPSIOIC06DUky7/22MmeAiFMmGjagIlBBQHasm3ffWbFGP12a8SktcS2/hvlOXWshW41o1Wy99smV cbEbeVH/FWQKmzMcE7dbJKP6w+8ZR/vwyXKYKYkKbwzHy4bWfCgOqjzgXcjxzxZE/ueBuEaTFWGHM Rh7s9PFPIj8CWMuzHpplzDq9um9EEGQM1dmcjpmH4qt9121UgMmuXjdaX6vjVcYDCPoPGe0xSMFhX 943wbEyH8VPI49Ey/3qlxJQmI0P7p8egScfvSkJ34AKDTKumuqKvEgP4ZnZI80RmkeIHEdf4dyG8N u6gfU6brXaZegA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:17 +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 ad18f62eb6..1e81c16979 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1701,6 +1701,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 0de08a4ad1..b106a604a7 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 ;;; @@ -1157,16 +1157,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. @@ -1175,7 +1176,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 10 10:38: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: 70187 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 8ACAB27BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 429B827BBE2 for ; Sun, 10 Nov 2024 10:40:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mf-00018l-Fr; Sun, 10 Nov 2024 05:40: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 1tA5MW-0000yD-21 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MV-0008G5-Hy for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=9cVS8/xpqaTCAlyXtRUMZCH5gx2IXS+Ji2GCvK80Jdw=; b=CY8+7jBDT8J9SiNKtCv4Xgm4NzabeTIS4GnxORr6lPaXR7IScN4zYLkrHMoKcYwjVDe5/SqFpnoO7uMv+0R0SSnfD0jwb/wBkEyrmjZBkwxJdoUhbuiHCdgvAaz9NshaborK+ehvPf3wt/szgOim3PvjZfJQyMjXg4kfGVeSw2La9ZhBDVtkDEolwZ/2Nwz0b3F8I6Lmzdz5XpuIE0UarlwVNYQLfxkAVjhtF9Wtuu0ZID5dSETnJDi3xhfLrRyXsxA9JFbOKwFBq636YxjNj6mKw1Zwpq32e0GeseO/wwtCK9gahl5fKE8NoFjgWm/jhi9xZ2osp2YnNJOAsMefxQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MV-0002kW-BT for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 22/31] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516510248 (code B ref 74290); Sun, 10 Nov 2024 10:40:07 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:25 +0000 Received: from localhost ([127.0.0.1]:55791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lo-0002ey-Cb for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lb-0002b1-UZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:12 -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 1tA5LW-0007sm-Nq; Sun, 10 Nov 2024 05:39:06 -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=9cVS8/xpqaTCAlyXtRUMZCH5gx2IXS+Ji2GCvK80Jdw=; b=hWWHRcO5JFsebQ2+fdrE U2gppgqMmQrkOwbU59ZdtS0hGqp18F+TNWzYUN9/h32THyDmIgBiBrBcBLIFPu2wp7Q1hCLeZw+nZ JLLw1hDnTC3vxoMx+km6P9fx3R9N2f5pZ29Oc0nSOvOI4H5ECsDAMYLxTs76vltx4RquEO4SYgehj 0ZRbsi/4GSsENplmAqVB7uJH6U+tPiJeLvduaIvmrIXN06jOytCi4TJ4vX7l/23x41MyHOMsTrA7t qVus9dmCrEmONHGDtd1FiZGXwbb0bUyrZ2024alq61DhQ5qfsLLnmeib4U98ZOWaE2qVe3yjOxQjg tDf5Pd9uyQBXZA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:18 +0100 Message-ID: <971d5c18860f5dc1dba30ffa5f4dd817b5f977c1.1731232753.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 06fae1bd3b..f9d8b28b8c 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 @@ -561,8 +561,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 @@ -576,7 +576,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 10 10:38: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: 70190 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 5D15C27BBE2; Sun, 10 Nov 2024 10:41:00 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 7DBEF27BBEA for ; Sun, 10 Nov 2024 10:40:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mb-00015t-KS; Sun, 10 Nov 2024 05:40: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 1tA5MW-000105-JL for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MW-0008GL-4o for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=sV5SsB9sebbUu4v31xkcnewo2VsNGx4ihlTSUMGUz1I=; b=bZVMlHGi8mkQVsuyXQ3kIoiHcgJSeno7oq65Lfbl2DAjuIXLe3PKtwQe560CyGRGTDr46Vq0x2uvjAwNq3ic385HHto+IQUstooaJe8yhupJBBKWy/eOZS0wSRC4utWIcLRZfo+TJc/b5s9h7tdt85SBzJld5nsRzNnKZAUdXOtc5xDJyEFpGFgMVPHwWQJ1bto3kLSHjpSxl2K7OdLWDSvijrYlJbGVV3JqNpFQbXxaPl9VjbEdxJzTIMuI/UZJfT80B1DZMGb8Te26tUWy0+DzH9WJvWp46OtZELIsPuACGbaBLDgoq8GlnOTW4oZWkhXAqr1FPstgd/cyMnmYFA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MW-0002kh-0U for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 23/31] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516610260 (code B ref 74290); Sun, 10 Nov 2024 10:40:07 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002fF-0f for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ld-0002bN-1g for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LX-0007t6-RR; Sun, 10 Nov 2024 05:39:07 -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=sV5SsB9sebbUu4v31xkcnewo2VsNGx4ihlTSUMGUz1I=; b=N25zDGH/R6nVxrOQHWtQ VBJgkoC1sw5pb24Oz4O48Li88lB9aa3L/fyD47uX7iOXoX8oFbWPPykJTYkkFEZv8pnoNG51gZ2Ha koW2uOEiLKwgRrZUvCNJ91UoSnwZbbrp+fhfZST9lc+alBaUQcikJx31qxqEIk52JEuTtWpYYKyKD NocqcEUdm8GE+9fEv3SAOTryLerAcpNTsIgDYDMwKWbx6kdTzZLsp9S+kpsFcY1A+OsgjObLozJwm 7x+w+TVANk+Cl+AjkjBGDx1mhV7S407X+4gwI8UWYS9pCA1fQNj20H16bdmXr6VEfMt5xAL6Tyh1E pFdCm2ZhdXFa9A==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:19 +0100 Message-ID: <22aeb4fc3065120e43b55b1a169e76b53e5da4e7.1731232753.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, disable -Wstrict-prototypes and -Wint-conversion, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 22 ++++++++++++++++++++-- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1e81c16979..9a4715df86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1816,6 +1816,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 f9d8b28b8c..973564ee33 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -573,7 +573,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")) @@ -586,7 +587,13 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) - "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 @@ -604,8 +611,19 @@ (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" + (string-append "WARNINGS=-Wno-strict-prototypes" + " -Wno-int-conversion") (delete "PKGDIR=libdde_linux26" make-flags))))) (add-after 'build-libdde-linux26 'convert (lambda* (#:key make-flags #:allow-other-keys) 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 10 10:38: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: 70189 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 D0B9527BBEC; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 79F2227BBE2 for ; Sun, 10 Nov 2024 10:40:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mc-00016K-3M; Sun, 10 Nov 2024 05:40:14 -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 1tA5MX-00010U-2r for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MW-0008Gf-Q0 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=y9+iCAg1WrVw46boFuQTULP/2NPeZB7ptfiR4ET/Miw=; b=keoiaHPNTL8aQpvNInjF4U8O8t2RyWFtAorBsRiaXxPz9Q5QXeVIm7iVvpD7TU/fSdLWCfi/eNp4JcDs+EPs+qJ8l+kmMz1YHXrW/MksAKQT3neMCE4rCWaaPkxAnCv6MeMFl+e0ZjFQwbAgjcGOzynnTmtrsW1wRoNwA7uhOZ77Zc8cBl1Aqi+kGAyFnEjLo0ngNMitk4wP0l9y5ZVJ0c9Kb66EZYZLcRF9xMHGqtNsSmJkxEX6jrimRvzwQ0VAMUHOesuNx/kMu3B2vTjAFnHvWxrFA2ABy/PySAi5WNUsuihCKh+Xxpw+j6cduvtr6StmHknOc31KUvLbT4+DRg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MW-0002lQ-Ky for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 24/31] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516610271 (code B ref 74290); Sun, 10 Nov 2024 10:40:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002fR-R9 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Le-0002bd-1k for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:14 -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 1tA5LY-0007tG-Pb; Sun, 10 Nov 2024 05:39: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=y9+iCAg1WrVw46boFuQTULP/2NPeZB7ptfiR4ET/Miw=; b=QGYXDN3Uj5bFtTw5/fQS 6qcK2/symSYsO9k20MLEikeJCUmPbI5iqLatn5CIhuk1DSv+E6CRrfcr+3757slFvxiPpyhm9zYqq jb1KbxnzUuQAHjtGGJkoGQssDQRNJkxqqWRTQfgoNYnZA9DcJ1cjPc5vJs0Mk1k/780D/7MphJUYr asSHcPbn/rLnQQkGJPB+T2f9MY+Xw2qM1tYWzagmW6bYgPX3e0qK66Rm8zv5YCDpNu0AZiGBwWSVb 8c62lDnUx64TYMwOJXCxhm49zI1VAqytZTiyJpIRO1hmSsjKsHdk6rM+PvhlI5+CjoAVeGTLr6cYV oTHfvFk9H06JHg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:20 +0100 Message-ID: <16521725d101731b06d55d21be690ee457fcd26d.1731232753.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 973564ee33..b156fcea4c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -665,8 +665,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)) @@ -680,7 +680,7 @@ (define-public rumpkernel (commit commit))) (sha256 (base32 - "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r")) + "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -800,7 +800,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 10 10:38: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: 70197 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 E5C8B27BBED; Sun, 10 Nov 2024 10:42: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 59B7D27BC00 for ; Sun, 10 Nov 2024 10:42:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Ma-00013J-8h; Sun, 10 Nov 2024 05:40: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 1tA5MX-00010x-N4 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MX-0008H5-Cx for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=Q2NtX7IDfA6q43nIMk6rOLLxA65uZVBfl0HnpJ80yvY=; b=NzqV2oS0/joZlJW9Zos2ZJv9RZ3FZmVWRRNZfKOWhSOWfnFxrMbbZMuGB0iw8xz2Hs8u++SdAWH2KZMq9i1Ujg+tERD8ys9SzgrY4JUUgkrp/5DPFvouXcmXP5QK9v0u9ndbHrV8jbcHtp4SYOuzDYZeHU2PFIq0KXZfO7iqyDFkuNkk6wrl1pORVTLja3TNkSVFNO2M8w7XDuuIS5mAGvIdqZWwyU11K1o/1wcciYdLWPKjD5E7ezclW5SdkZCqucPobKB2hElKwDIJqRCJn5odnAkhne4WUovhfPcALo526WflcTny1kDryxZns4t+vp9UfznK2xX8Wv5TAfJ7Fw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MX-0002mL-7P for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 25/31] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516610278 (code B ref 74290); Sun, 10 Nov 2024 10:40:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lq-0002fc-Al for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lf-0002c1-4C for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LZ-0007tV-NJ; Sun, 10 Nov 2024 05:39: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=Q2NtX7IDfA6q43nIMk6rOLLxA65uZVBfl0HnpJ80yvY=; b=kCib4YUbeGOKq9Y+DiiY ppGgmC4Qnv7cbiL5bvyF2DFZ6I7NpHf4x/tr1sNQIB+XAG1c8PWPGtkV4sHyi9nudYq3h0dbh5BMi PdjdmPN44Wbjco4eb8Xm6xl4yGC3bJXN3lF1nD72aGD80KXScYet249roC6h/pET1iFA6TzENoWRc Ot5MU4/QBSyet0mCYhZiXkQOAZWer6AnHWM3Oilm370b3rsYzqGkbZqqnPY4sJQ/FemIwf2f08TP3 VQwy3bvVBM7iYkDuDkKFOFKqnYy7rmZKha7GCgisnGbnLz7Og3KsNDU/hkshtNHWZniVmdk/xsllp V8rcwTPVOnhJGw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38: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/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 b156fcea4c..d29ec22cd7 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -781,6 +781,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" @@ -791,7 +794,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 10 10:38:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70196 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 66F0F27BBEA; Sun, 10 Nov 2024 10:41: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 C567727BBE9 for ; Sun, 10 Nov 2024 10:41:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mb-00015N-AZ; Sun, 10 Nov 2024 05:40: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 1tA5MY-000117-54 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MX-0008HJ-Qy for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=Ag4EZGIwGxt3LeRaxY2LpxM+Fiigr8DC4RzGYYe7q+U=; b=XJJH7HOrg+MeyWdAokaLzSMqemUb1rJunSI13cX9Gk9Iv9F0/b4uIjNG2j8jl6nNAiQVjrLn0iG4MERffwQljTAclFDIaJMOL7s3YfyLKQPva/g4oxoxLp1S/CJTeMnrrcKhtmnxzAj5jsYxnzTzW/r78ZL8MGDaM1tdfCoXscGyblFX6DKPYbQQPu3+ZvlUBu1UjE5q8BCqu+ZXmtlPFFaEq4MDXw2j79pAqfFczPrnWlA2CP9/GyfuqrpxVAJZnGPWDADUs8BgPZKm8qJI1mB1CVbiuOV/rj1QG/7H47fEnTj7wxx7mmPgAHbaxxQq0hsrFbcaqFvOSyZRQxTEWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MX-0002mo-N4 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 26/31] 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, 10 Nov 2024 10:40: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.173123516710286 (code B ref 74290); Sun, 10 Nov 2024 10:40:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:27 +0000 Received: from localhost ([127.0.0.1]:55804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lq-0002fj-R1 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lg-0002cX-Of for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lb-0007uI-Hx; Sun, 10 Nov 2024 05:39: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=Ag4EZGIwGxt3LeRaxY2LpxM+Fiigr8DC4RzGYYe7q+U=; b=RBrQ4EW7gX9WTB/Ww+Zk lJbY9CRaL9cEW2PCMVTjd5RpHqyuY8D7nPt1fQA3GzTalZ3TIAQ0h8ZMd2c4hBw17gD1zG1ka0Vxu dlw6TUvUFO77f/Gtg7Lp4QRYl9dSRcuZzKJK+Y4LfjufiAbGFgHBRWR72oHmMkgx1ie1/vlfwvTQd pdKcFncIJOUQ7h1cRQl9/uA1RLsQQS0kCo62nP3zng4K+wdRCr3DcsPXQNQXxOA6cGXHWLYPkFkOm eRVfGvHU/SjLGiOnTbaH2TlL+mvdEq/KtlfEChdW3i49U72sLG/0XFLnTlZnWy9QtLX67b+qs3t0J kMKXTFEcKRv72w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:22 +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/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, disable -Wstrict-prototypes and -Wint-conversion, and follow upstream's "amd64" symlinking voodoo. Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 115 +++++++++++++++++--------- gnu/packages/patches/hurd-64bit.patch | 56 +++++++++++++ 3 files changed, 131 insertions(+), 41 deletions(-) create mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a4715df86..cf0de3d92e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1545,6 +1545,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 d29ec22cd7..7aed0ebe1d 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,48 +468,80 @@ (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)) - "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-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") 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 10 10:38:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70195 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 81AFB27BBF9; Sun, 10 Nov 2024 10:41: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 9313327BBFE for ; Sun, 10 Nov 2024 10:41:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mb-00015L-AQ; Sun, 10 Nov 2024 05:40: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 1tA5MZ-00011t-2A for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MY-0008He-Ix for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=; b=ZD9/qbxcRteLgtPAyvH9GlWsrMsnXpB22zEUXsCI5oZkpP7cnTEZj6fByGixKwlujnpVdNrsds5MmQ6AvAmPNtR7ATaOTfvaXYlBVTP5ZDV3W+jGXdMCeUfRylC53BaITSrCXeoIEotuFcWhpPPPp7pOler+EsCav7kzZ7CI/fl4Ey41FVaIoyFX1tWVxyMJlieZ0+DGgjXVva+WBn9+mohOHgmG79qga0PORoC7LFAYaYDLss1LzX6ziWzmqu5/OgFwhFMkGCgNwdhISFop9tqKO/u4rYAfr2AeC0R5T3LW0ikte0OluijlKSSy7OxwwmX0P6xeRGKGv6HUoUiWiA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MY-0002nK-D3 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 27/31] gnu: git-minimal: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516810293 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:28 +0000 Received: from localhost ([127.0.0.1]:55807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lr-0002fw-L9 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002d4-0k for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lc-0007ug-Qc; Sun, 10 Nov 2024 05:39: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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=; b=Rxc8vjzxgMJwnqpix6km 4pv4mTRYQPzAfrZojtCc3b1x4jq38c8pPl6UgF+5PuLt2PzU8WnX9sWV0kTDXZ4A2J6Fqsfz62jjG EaLqF2+5BCgGvZSuCruXtHT7YAonRIr5NZari5wIVBbnIfOr1CPO1ymu1+iKgmowzyJ0ymCSfd8IH C57upQA7HNgmj5MFgV3LdQfGmNSXoLwZ1FRbvYuoF1jVnx7L4calsnpBCfzUBWqsJdUnwpjnJGfwn DYehuulsN4xhRGSB2/qhsOPlJUYgN5iE5/8Ey3rOog5BVqBkG2uGwpmlOhu5gPQd2A+T9Zs8nThSg LBggBoYywM1EQg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:23 +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 using gcc >= 14, 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6bd37fee82..136d52af51 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -111,6 +111,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -292,7 +293,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 (version>=? (package-version (current-gcc)) "14") + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -301,7 +305,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 10 10:38:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70183 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 4DAB727BBEA; Sun, 10 Nov 2024 10:40: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 A04E127BBE2 for ; Sun, 10 Nov 2024 10:40:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mf-000196-NK; Sun, 10 Nov 2024 05:40: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 1tA5MZ-00012f-GJ for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MZ-0008Hl-28 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=rJ8jfnhCeoVV+x/9o+NL7WQIQ8xlahB8wzLvJo0VmqWYxM0nkY9S1w2fNttYyft6a0d9BfpgzUvINw++XasAfRIPxLmWFS71ZUmYpikCyXrW6T7nVOLP8XjtFx0bNqD1/yYOrH6NDy2PET+iALB2aKF/Gra0uImiAXYDFctc6P7Ei4N1t9XK3VFjaf+3TnTVa8Jq7pGLh76qcbg7/qdzSrbd707oPVhYyxV0Mzjx5zgR+EyrckRT4UT2SSljzB/2sKOCXDokr/XiGOV37Dn0tbkUzjHAK8YUyh9ggnlwEKzy6HQ2nuP4XfbupllTaGSlf4zb+ctZEbT15d8eb5ikmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MY-0002nh-TW for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 28/31] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516910302 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:29 +0000 Received: from localhost ([127.0.0.1]:55809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ls-0002g3-6J for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lj-0002dH-Tu for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Le-0007vT-Mp; Sun, 10 Nov 2024 05:39: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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=Fe9o/xOG/aT4UVnj7AaS MMD66ejxsz7e0ax0GsL8p5JQ8tCHuo13OGdoChga2nYO7KKvgxoqnOuVuBdxV5fYAmIqYJ6+JnUrj 4WWCjKS0DHayOXNQP5JcvhVDnQu3w2S9hUljCgjStrVY12spF1NXMcwfugU3V2cWmhnWJqhVRPL96 WqKgV1u17kQBaPqxFyEG81cxaqo4q8ljILsLUT0K5nymutyYY/uEBinL5gXtScLZPTkG214DMar1Y zkaDrsCfCJETOLzVxNiiouSD3i0lQoUJ6ZNxHnPXoZGlAX/JfC650/TZZ8E3sCj0YXi/m14UIICuI U6DEH8cvhS4s0Q==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:24 +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 cf0de3d92e..6a46241e5f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,6 +1568,7 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.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 db9aea31a5..f0dde60d6a 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 @@ -1000,7 +1000,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 10 10:38:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70194 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 33A6427BC05; Sun, 10 Nov 2024 10:41: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 B2E1127BBEB for ; Sun, 10 Nov 2024 10:41:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mg-00019W-AW; Sun, 10 Nov 2024 05:40: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 1tA5MZ-000133-UM for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MZ-0008I1-HA for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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=nPYNfTa/3ucO7U+OuWF9dNFD6+EfXPsC1V6KnzNYCDA=; b=XajZ5DT2HJLbIqkLYUqHPub6Fzm/2xkswfj+IkghPdGfopey7B9LCeetIDptujqMvlO+5Qng/w/wwLMwjtrW+USA6lbHLCnwWF5TtrAkEnsF/BZEXIKrHBI3U5B1EiZ4Wx1O2p9XtUibwsDYa6RRqF7i0gTEr1bHmPzmCwDcSzXdicQ81jRk+RHIgbwvSMAHnWuCQhVF5OMqMTLoGZSnV/nnArcUDFz1myaBCvryfFL+wYsho1g8bHZmMP1+jtr7/fcuFxMwQIefQvKHIg789UM6X04oiv+G3WCn++tRDrlrjsi1736gjdbylAGHow6VTBbnN96BRzu5RPgN624dow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MZ-0002nz-Cy; Sun, 10 Nov 2024 05:40:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 29/31] 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, 10 Nov 2024 10:40: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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516910308 (code B ref 74290); Sun, 10 Nov 2024 10:40:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:29 +0000 Received: from localhost ([127.0.0.1]:55811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ls-0002g7-Qp for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002dP-05 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lg-0007vi-QF; Sun, 10 Nov 2024 05:39: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=nPYNfTa/3ucO7U+OuWF9dNFD6+EfXPsC1V6KnzNYCDA=; b=rEOdAx4kf0IwL4tpPPui Fc6UO7HOZqylnncAa8Y3gh2S/jG370AsS/W6Ss3OWCgf4ymbSarwimJmi3buXqcDJGZHrTSlgiJlh xAn8/0RnOj603mM/M5F3JDrRD1Nt9kKX3QvcWa+zkDMPuBa+VM2q3lxtu1zvxgsVRbB2AXj9yMEAm sVyfxU3+pN1R3KTF6Oe1njl8hTY3t8FSiTQG2hpgldbBUDeJ6Wlc6PF50zH9xlgUnvx9ZOnJkwmgU /C/Q0h4Jf8UnQag2iq/PG+KGw8VDaQlZfDVUzlVu13P+5zIgsHFArxVa+eSn69hfuFA0KtFNqds8C nipdEgJWYPkfFg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:25 +0100 Message-ID: <83a995681b1b8cf9894b9fbc1e3c65cbbb855bbf.1731232753.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 6a46241e5f..11955c7a49 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1487,6 +1487,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 8ae9621e5b..781000af1b 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 10 10:38: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: 70193 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 BEC4927BBED; Sun, 10 Nov 2024 10:41: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 EE32A27BBE9 for ; Sun, 10 Nov 2024 10:41:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mc-00016T-Ay; Sun, 10 Nov 2024 05:40:14 -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 1tA5Ma-00013f-Dx for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5MZ-0008ID-Uz for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -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=zt1jdjXqyEh2UXoxu4/4anI4OnXrBda4an/zBxZV0CQ=; b=Lqn4qjuPvtIyiVQluwL4EFWa+kwaY2H0ZBC70UyTG9nTzA5nz+u2GN68M1sU4ySiSD3BJtqxRKBmvlMx3ez+x100L0xc7JF054/ojH7khRA3vuUfSVxAs6WyRpCRavMwQ+JnNI92XSjcwyQcPQvJL8EChmpUoZLJduipaw3aKNlNrpQTbNOIHFHEb0ltcjGsKwe0qlg/vPnUNlq6MU1iSUfy9PkKMCkKuOk6M9SC7kMNEzYDOfn7BqIfTQAoKvB3/xfgNZxDRg+igDMI8biPiCsd6QcMj5wbBOJ4Zf7Z5RYlnXxNmJ9sh5nhf8PYUuow7x7o/zR9ooCUQgg8wAWhfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MZ-0002or-Qy for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 30/31] 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, 10 Nov 2024 10:40: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.173123518710340 (code B ref 74290); Sun, 10 Nov 2024 10:40:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:47 +0000 Received: from localhost ([127.0.0.1]:55813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5MA-0002gh-CQ for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lo-0002dl-01 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Li-0007w2-PW; Sun, 10 Nov 2024 05:39: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=zt1jdjXqyEh2UXoxu4/4anI4OnXrBda4an/zBxZV0CQ=; b=VuUwxfTslPuRMxAB8G45 NUMltpB5QWMe4NIf7N6c3k9BK8EXMwvCpotTjXBptUsxSMBIyD2j3qfJN0myYcDd9b/qvDMYtxUE5 qoPMoBn30RhU/lIuPt7+QDPi160gggtwV7dGUjogAKwP3kvU6VKb5UmPp33QaXubDw3nxASOXCQQQ mOPwrToSVIL9B4B3FwCAMlpNj25mZwjjOl/GE+V7Aj0X25nvnkq8lDL7yD3GejR/ofo+V1p2Ft2Tj ZOyodDImfsTYs2EjCQJwakTG41mjFNHoJpVeeciTdPfkIt+dTXygHitdu0PZqXsU/S1RcYZrCisRe YlCBRO/LoW2W+w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:26 +0100 Message-ID: <86686ad32c0d7b3213d9e7c3640b61b4e4672fc2.1731232753.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 ea192c2c03..a874ab908d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -855,7 +855,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 10 10:38:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70181 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 B0F5627BBEA; Sun, 10 Nov 2024 10:40:22 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 66A6327BBE2 for ; Sun, 10 Nov 2024 10:40:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Md-00017O-Kj; Sun, 10 Nov 2024 05:40: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 1tA5Ma-00014q-OE for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40: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 1tA5Ma-0008IS-E3 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -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=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=e+dxAmnxMvBLuLKGSAfInZ10s8meMrMV0ppuP5VumTdj+JR+mH8FA5e3x5g8czFmQGyEwnMNRQAWzRYn+SBPHsGzCd2Yx6AW7ySImtbtU94xY9kEjKS0DklOPwB5TMPlW0XtMRhJG5dmLF5dKnqVM1saE7EoCn8pZSPyZQIOqDi91Bs6QyqHzXqJSqfp+gbukUWC34FTuGFdXuPkUHcJyCswpSBf4o9TieD9/0OnfX5lRIV1y8UJ9FPqjmQRjn64Ifb2i9jgwQzsQ0GlA287sAFhUXoTaTmUQx5tQGshlHe3tIyrnZEcU2rCf1fKD3lduqyGMqxEk4XxUtosmW3HdQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5Ma-0002pb-A7 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 31/31] system: hurd: Use 64bit gnumach for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123518710347 (code B ref 74290); Sun, 10 Nov 2024 10:40:12 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:47 +0000 Received: from localhost ([127.0.0.1]:55815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5MB-0002gj-2O for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002dy-8E for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -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 1tA5Lj-0007wB-Qm; Sun, 10 Nov 2024 05:39: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=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=ghLVa98i8SSp9HqmKvnY a09RTheI9oML3pCm7+XTvG9UkP7P07iQREbiJmIBRWD22eJPG9IV05juV8UGTfagb5counsekGWfC +atlR0viyyGBOd8a2zccLRKzUe26IBNODp1e8diFd/NLwenf76tflsIsbgYQrSnO+e54fgvN2ZyP3 sMTXSd3Tx8nWuXPNAi+dojfK2HkYsxSV8EjamDpgmHjNACuTB4T53fdhn/TxJUqQSSz2KSn1vw7e2 pgZOiaTugDrCv37pWjf8xsEVKH4VUFmEKBgZ1Ne87L0XOEWzwyae9rjLZ0pdUDXfbxvSQQstYz3dl 8pkr9stpCgPllw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:27 +0100 Message-ID: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.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/hurd.scm (%hurd-default-operating-system-kernel): Use actual (%current-target-system) to specify (%current-system) instead of using hardcoded "i686-linux". Change-Id: Ifc179bce221b1a54461860c24ba400cf6932ec86 --- gnu/system/hurd.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9a351529e8..58e41959f4 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) @@ -64,9 +65,13 @@ (define %hurd-default-operating-system-kernel (if (system-hurd?) gnumach ;; A cross-built GNUmach does not work - (with-parameters ((%current-system "i686-linux") - (%current-target-system #f)) - gnumach))) + (let ((system (match (%current-system) + ((? target-x86-32?) "i686-linux") + ((? target-x86-64?) "x86_64-linux") + (_ "i686-linux")))) + (with-parameters ((%current-system system) + (%current-target-system #f)) + gnumach)))) (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to