[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failure
From: |
Ludovic Courtès |
Subject: |
[bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures |
Date: |
Wed, 22 Mar 2023 17:28:39 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
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’.
- [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig., (continued)
- [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig., Ludovic Courtès, 2023/03/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
- [bug#62307] [PATCH core-updates v2 15/20] gnu: linux-pam: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 16/20] gnu: linux-pam: Allow compilation on GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 18/20] gnu: guile: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 20/20] gnu: guile: Fix 'posix_spawn' usage for GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 00/20] Update Hurd and fix build failures, Josselin Poiret, 2023/03/28
- bug#62307: [PATCH core-updates v2 00/20] Update Hurd and fix build failures, Ludovic Courtès, 2023/03/30
[bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures,
Ludovic Courtès <=
[bug#62307] [PATCH core-updates 04/15] cross-base: Factor out cross-mig., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 10/15] hurd: Remove useless glibc/hurd-headers input., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 13/15] mig/32-bit: Remove., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 05/15] cross-base: Add cross arguments to hurd derivatives., Josselin Poiret, 2023/03/20