From: "Ludovic Courtès" <ludo@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: 62307@debbugs.gnu.org
Subject: [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures
Date: Wed, 22 Mar 2023 17:28:39 +0100 [thread overview]
Message-ID: <87jzz8bvig.fsf_-_@gnu.org> (raw)
In-Reply-To: <479a095a315dc959fc63e26c24d7cb8843b947be.1679349992.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 20 Mar 2023 23:10:38 +0100")
Josselin Poiret <dev@jpoiret.xyz> skribis:
> * gnu/packages/gcc.scm (gcc-11): Add ugly conditional patching, to avoid a
> world-rebuild.
> * gnu/packages/cross-base.scm (cross-gcc):
> * gnu/packages/commencement.scm (gcc-boot0): Pass the patch there as well.
> * gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
[...]
> + ;; FIXME This patch is not in the origin because it is conditionally
> + ;; applied, to avoid rebuilds at the end of the core-updates cycle.
> + ;; Move to gcc-11's origin ASAP.
> + ((target-hurd? (or (%current-target-system)
> + (%current-system)))
> + (list patch-boot0 (search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
> + (#t '())))))
>
> (define perl-boot0
> (package
> diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
> index 2959616af6..30bf1c6bd0 100644
> --- a/gnu/packages/cross-base.scm
> +++ b/gnu/packages/cross-base.scm
> @@ -319,14 +319,21 @@ (define* (cross-gcc target
> ("libc" ,libc))
> `(,@inputs
> ("mingw-source" ,(package-source mingw-w64)))))
> - (libc
> + (else
> `(,@inputs
> - ("libc" ,libc)
> - ("libc:static" ,libc "static")
> - ("xkernel-headers" ;the target headers
> - ,@(assoc-ref (package-propagated-inputs libc)
> - "kernel-headers"))))
> - (else inputs)))))
> + ;; FIXME Kludge to only apply the patch for hurd to avoid rebuilds
> + ;; remove ASAP, along with the accompanying changes.
> + ,@(if (target-hurd? target)
> + `(("patch" ,patch)
> + ("_" ,(search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
> + '())
> + ,@(if libc
> + `(("libc" ,libc)
> + ("libc:static" ,libc "static")
> + ("xkernel-headers" ;the target headers
> + ,@(assoc-ref (package-propagated-inputs libc)
> + "kernel-headers")))
[...]
> + ;; FIXME We conditionally apply a patch passed in native-inputs, to avoid
> + ;; rebuilds at the end of the core-updates cycle. Move this to a regular
> + ;; patch ASAP.
> + ((target-hurd? (or (%current-target-system)
> + (%current-system)))
> + (substitute-keyword-arguments (package-arguments gcc-8)
> + ((#:phases phases)
> + `(modify-phases ,phases
> + (add-after 'unpack 'patch-libpthread-hurd
> + (lambda* (#:key inputs native-inputs #:allow-other-keys)
> + (define patch (search-input-file (or native-inputs inputs) "/bin/patch"))
> + (define the-patch
> + (cdr
> + (car
> + (filter (lambda (input)
> + (string-suffix? "gcc-11-libstdc++-hurd-libpthread.patch"
> + (cdr input)))
> + (or native-inputs inputs)))))
> + (invoke patch "--verbose"
> + "--force" "--no-backup-if-mismatch"
> + "-p1" "--input" the-patch)))))))
> + (#t (package-arguments gcc-8))))
> + (native-inputs
> + (cond
> + ((target-hurd? (or (%current-target-system)
> + (%current-system)))
> + (modify-inputs (package-native-inputs gcc-8)
> + (prepend (module-ref (resolve-interface '(gnu packages base)) 'patch)
> + (search-patch "gcc-11-libstdc++-hurd-libpthread.patch"))))
> + (#t (package-native-inputs gcc-8))))
So, we should discuss with others whether we can instead do another
round of rebuilds. I know, I know, but this is really quite complicated
and better avoided.
Side note: please use ‘if’ rather than ‘cond’ when there are only two
possibilities.
Ludo’.
next prev parent reply other threads:[~2023-03-22 16:29 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 22:07 [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 01/15] gnu: glibc/fix-for-hurd-cross: Add new variant Josselin Poiret via Guix-patches via
2023-03-22 14:54 ` [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 00/20] " Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 01/20] gnu: glibc: Work around broken GNU Mach header detection Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 02/20] gnu: cross-base: Use gexps for 'cross-gcc-arguments' Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 03/20] gnu: gcc@11: Patch libpthread on GNU/Hurd Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 04/20] gnu: cross-base: Factor out cross-mig Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 05/20] gnu: cross-base: Add cross arguments to hurd derivatives Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 06/20] gnu: cross-base: Removed useless inputs to xhurd-core-headers Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 07/20] gnu: mig: Update to 1.8+git20220827 Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 08/20] gnu: gnumach: " Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 09/20] gnu: hurd: Update to 3ff7053 Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 10/20] gnu: hurd: Remove useless glibc/hurd-headers input Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 12/20] gnu: hurd: Update DDE and use libdde_linux26 Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 13/20] gnu: mig/32-bit: Remove Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 14/20] system: hurd: Use shepherd-0.8 in the package list Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 15/20] gnu: linux-pam: Switch to gexps Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 16/20] gnu: linux-pam: Allow compilation on GNU/Hurd Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to gexps Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 18/20] gnu: guile: " Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: " Ludovic Courtès
2023-03-28 14:28 ` [bug#62307] [PATCH core-updates v2 20/20] gnu: guile: Fix 'posix_spawn' usage for GNU/Hurd Ludovic Courtès
2023-03-28 17:07 ` [bug#62307] [PATCH core-updates v2 00/20] Update Hurd and fix build failures Josselin Poiret via Guix-patches via
2023-03-30 10:48 ` bug#62307: " Ludovic Courtès
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only Josselin Poiret via Guix-patches via
2023-03-22 16:28 ` Ludovic Courtès [this message]
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 04/15] cross-base: Factor out cross-mig Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 05/15] cross-base: Add cross arguments to hurd derivatives Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827 Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 08/15] gnumach: " Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 09/15] hurd: Update to 91a51672ff4cfe1f1a0712b4c542ded3081c825b Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 10/15] hurd: Remove useless glibc/hurd-headers input Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 11/15] gnumach, hurd-headers, hurd: Switch to using cross-mig Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 11/15] gnumach, " Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26 Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 13/15] mig/32-bit: Remove Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 14/15] system: hurd: Use shepherd-0.8 in the package list Josselin Poiret via Guix-patches via
2023-03-20 22:10 ` [bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux Josselin Poiret via Guix-patches via
2023-03-22 16:30 ` [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87jzz8bvig.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=62307@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.