Janneke Nieuwenhuizen writes:
Hi!
>> Long story short: I’d like us to freeze and merge the branch ASAP,
>> notably because the glibc graft on ‘master’ leads to a bad user
>> experience. I’m happy with the current state of the branch and wouldn’t
>> mind postponing remaining upgrades for the next cycle.
>>
>> Thoughts?
>
> FWIW, I'm all for this. The longer we wait, the harder it gets? As
> soon as everything works, see below...
Hmm, I just found than binutils 2.41 update makes guix system builds
hang.
Trying to build a bare-bones system on latest core-updates
8e9573784f gnu: binutils: Use gexps.
makes my builds hang, something like this:
--8<---------------cut here---------------start------------->8---
./pre-inst-env guix system build gnu/system/examples/bare-bones.tmpl
--substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org'
The following derivations will be built:
/gnu/store/lhzmfv4jpxa5q578mj9a5cqm605szd0v-openssh-sans-x-9.6p1.drv
/gnu/store/0fsnwwdq2lfs312x4wklaifahrd4g6s8-libfido2-1.12.0.drv
/gnu/store/4z6bhwca0c77vfyv08r17180bfhk1yan-libcbor-0.9.0.drv
/gnu/store/hg2m6hwxvbr2g24vy6671mpkib8zsw97-cmake-minimal-3.24.2.drv
/gnu/store/caz92q8bjv8f4lj521p46mlzkvhn41da-jsoncpp-1.9.5.drv
/gnu/store/38r0krrvy8pq9jrmp7c0ma2kbx8qd701-meson-1.1.0.drv
/gnu/store/a0gkj5v8siy3gz6lfb1nqcb4wsqzn8ya-ninja-1.11.1.drv
/gnu/store/b0fbaqrac56icsxscxpvdfng5z6yhq71-python-wrapper-3.10.7.drv
/gnu/store/fz4hgpbh9lknxzidwv5x137x0b7migh0-python-3.10.7.drv
/gnu/store/yj95nxjdbpvsxsylf6gcnxlx4rp8mcc4-tk-8.6.12.drv
/gnu/store/10m9hdrrpmnhr3znzly85xlgzjn749c4-fontconfig-minimal-2.14.0.drv
/gnu/store/d93f9wnfkvc1xvympka1cb22rw503y11-util-linux-2.37.4.drv
/gnu/store/sjqccg7x5y3fsqw5ckfycnpn7xr8j7r9-libxft-2.3.4.drv
/gnu/store/cp13i1j9ps9pyjwc15g816b85dkyl0vq-cmake-bootstrap-3.24.2.drv
/gnu/store/lhgklfavn3vzb54k79a0b92l7igf924k-eudev-3.2.11.drv
/gnu/store/akc2na9mq2828dn8jrsmbiqa2ig2vlfl-docbook-xml-4.2.drv
/gnu/store/d446f0fvxiyb0yyn29m810xx0ir7pkhy-docbook-xml-4.2.zip.drv
/gnu/store/hn4hfa29m37nw8h5zhsmvalv8k2l2yig-libxslt-1.1.37.drv
/gnu/store/sih04p2g7biabl2vmpiyzi2y7qricsfd-kmod-29.drv
/gnu/store/rgchv9xwb9b5yxlm735dkviqg4wcil6l-groff-1.22.4.drv
/gnu/store/fjw8nmqbp4dnw7z50vf4irnw89dmpk43-ghostscript-9.56.1.drv
/gnu/store/9d5bvapjn204psjhy7y6ha7s44bm5qfw-libtiff-4.4.0.drv
/gnu/store/jv2c49136qjjc07ci672wgs75jzi6dnm-libjpeg-turbo-2.1.4.drv
/gnu/store/m0i18w2cph650ij00an2a1d9qkmqh719-guix-1.4.0-16.aeb4943.drv
/gnu/store/k14d28rr2m9k81zsypy9lq5pvn8k2ll0-glib-2.72.3.drv
/gnu/store/m8khxba6l2jrgpwgfb0g8wh8snjpa0sc-gd-2.3.2.drv
/gnu/store/k14d28rr2m9k81zsypy9lq5pvn8k2ll0-glib-2.72.3.drv
/gnu/store/48qac6sz2v7mfl5mkwdrkd2z87ixmdsa-fuse-3.10.5.drv
/gnu/store/1ph5lg8zqzdjihwc7l9im70fzbb1cyah-sudo-1.9.14p3.drv
/gnu/store/3hmfw28ah140d3x1yw9i6cm7lzmcjmxi-ath9k-htc-firmware-1.4.0.drv
/gnu/store/jvypzi6nzykx7nnd63f4idivpj9j9wim-binutils-cross-xtensa-elf-2.33.1.drv
/gnu/store/a1nw6yk94darc88n0pdbvrgza8wq31f3-binutils-2.33.1.tar.zst.drv
/gnu/store/krpdfg0qyyany9xc5ij3d4gcrwa9xnl6-gcc-cross-sans-libc-xtensa-elf-11.4.0.drv
/gnu/store/54lg5936smd3qz46s9103rz1ydkk3b8k-gcc-11.4.0.tar.zst.drv
/gnu/store/p32nkyms8va5hy5n2l10b6q5is0fr5rc-ld-wrapper-xtensa-elf-0.drv
/gnu/store/gn6xkcxyg39p3h219w6fy5rdzgapbg28-font-gnu-unifont-15.1.01.drv
/gnu/store/5f63hg1jffbj7fs3xwn6hxc39l08qxqb-fontforge-20220308.drv
/gnu/store/6fb0kk7h8ab5kb0x3clbwjd8id1gp48v-graphite2-1.3.13.drv
/gnu/store/h7zhalr1x8q45y0y8g4fr4b702qydpzq-python-fonttools-minimal-4.39.3.drv
/gnu/store/8hv25v0b53fw310dc1lm109h8p99dhx2-pixman-0.42.2.drv
/gnu/store/9cyw5zqs9p9zw2bxirjp8yxp9miijc32-cairo-1.16.0.drv
/gnu/store/3zprmc5g596x3kfypxv3jnbwz0r17s8j-libspectre-0.2.10.drv
/gnu/store/8x4h6wrwhpx9vd2mxfyzcx2z5nqf6rxc-gobject-introspection-1.72.0.drv
/gnu/store/aiaa10v9s58sxppdsq68qdvhy30nh64w-poppler-22.09.0.drv
/gnu/store/9hw0jx1l8pbigvwhvac7397jk6vd8avl-poppler-data-0.4.11.drv
/gnu/store/baxa9bqxyr1r6fl45vdn7vgw67jcgri3-cairo-1.16.0.drv
/gnu/store/hcx98b40y3y9apffyibkl20mgiw66nn5-libdrm-2.4.117.drv
/gnu/store/vjwmxprd3h2xgwapdj2mmajiq0jgaq3g-libpciaccess-0.16.drv
/gnu/store/vkklm8wiz5h9i5b9b7apbhwk13rxmqzk-pciutils-3.8.0.drv
/gnu/store/bmbhwyn0x6gvk4rkvfhg4zvzd07lwm7n-nss-3.88.1.drv
/gnu/store/nhsjl5fr3dadv5dhccj7im8mvm0cf97z-lcms-2.13.1.drv
/gnu/store/wxnha137vpsra56ch2wbhs9pvpmcdy3k-openjpeg-2.5.0.drv
/gnu/store/afk7wrjyfnyji9civlwj17zjhxchi641-libxfixes-6.0.0.drv
/gnu/store/d6ah0rz6ix1ab50vz2cax67815y7kgq7-libice-1.0.10.drv
/gnu/store/hf24av4ll6mjad9rl1cyvwvzgii5kljz-libdatrie-0.2.13.drv
/gnu/store/npr7731ri5cjjq3gyfs4f8y3x294mk2s-doxygen-1.9.8.drv
/gnu/store/hjzica9kzblqh84pmadm5phn3n9vxh3r-pango-1.50.10.drv
/gnu/store/njrak7qfqdrvjffhqn4vgfg3l0381c0h-libthai-0.1.29.drv
/gnu/store/pim3bbh1lqynzcvhzzvicbwyfh42ihxk-harfbuzz-5.3.1.drv
/gnu/store/jyyzbwangjpk248q25p07dibmc12cdr0-libsm-1.2.3.drv
/gnu/store/lhmm4plz7ccchg3q4bajc8ckdkp8dsx6-potrace-1.16.drv
/gnu/store/sdy15gp9vvdjsx9z9031l1nsarxaw7hr-libxi-1.7.10.drv
/gnu/store/7hzd53sswnyjxp7ng7vhm0sw8f0l7ars-unifont-15.1.01.tar.zst.drv
/gnu/store/9kwz4m5l1jxn3v4zwia6pkqc7xc3fhaq-perl-gd-2.73.drv
/gnu/store/vphahbm51dzkqklsznhfdd46gc3c7ldd-perl-extutils-pkgconfig-1.16.drv
/gnu/store/ivlznmdp4bymx8vw8vh10b2svhdv4ngv-bdftopcf-1.1.drv
/gnu/store/cnrgn076hzzf0dfrdx1ay2fmsmblxgjn-libxfont-2.0.4.drv
/gnu/store/v98n0caiggd636wfiz026xr6rrbn63mk-console-setup-1.212.drv
/gnu/store/3liqjbh0dlqcw17pgzx7872brj7qs2cw-bdfresize-1.5-11.drv
/gnu/store/d4k5i8qqs4k174wvj92hhk9hniqrwl5h-sharutils-4.15.2.drv
/gnu/store/6pia3gnj95vvpd8fy8vi17a5gg9f3rrq-sharutils-4.15.2.tar.zst.drv
37.1 MB will be downloaded:
/gnu/store/31kg7d3kss14nwgx0kzhfi2ls5l7agv3-unifont-15.1.01.tar.gz
/gnu/store/69bvs8v5dbsc6gb3gpli4hlvkqlcvdna-fuse-3.10.5.tar.xz
/gnu/store/866x4xwfb9s4j2y3f809qi1i6w5n2f09-avahi-0.8
/gnu/store/jypawv1gvkr6v2n0vi8n79j4y6z6jpy7-guile-avahi-0.4.1
/gnu/store/jpybmbc71ahiw9dyvszfh6xn5a60s25g-util-linux-2.37.4
/gnu/store/6x525gmd8j25grkhh3p9awpbw9xq1bb8-gts-0.7.6
/gnu/store/p77bf7vfa92x75w3fnsq7mys4nsf5f19-graphviz-minimal-7.0.1
/gnu/store/qy68wigyhxjm5mhgqgkd427z19lqzhip-disarchive-0.5.0
/gnu/store/m7w9168zdq1vbkm8hn220xgcp7iav9ka-guile-semver-0.1.1
substituting /gnu/store/69bvs8v5dbsc6gb3gpli4hlvkqlcvdna-fuse-3.10.5.tar.xz...
process 20694 acquired build slot '/var/guix/offload/kluit.dezyne.org:22/0'
normalized load on machine 'kluit.dezyne.org' is 0.00
building /gnu/store/3liqjbh0dlqcw17pgzx7872brj7qs2cw-bdfresize-1.5-11.drv...
process 20700 acquired build slot '/var/guix/offload/kluit.dezyne.org:22/1'
normalized load on machine 'kluit.dezyne.org' is 0.00
building
/gnu/store/a1nw6yk94darc88n0pdbvrgza8wq31f3-binutils-2.33.1.tar.zst.drv...
process 20708 acquired build slot '/var/guix/offload/kluit.dezyne.org:22/2'
normalized load on machine 'kluit.dezyne.org' is 0.00
building /gnu/store/54lg5936smd3qz46s9103rz1ydkk3b8k-gcc-11.4.0.tar.zst.drv...
<hang>
--8<---------------cut here---------------end--------------->8---
I first encountered this problem trying to ressurrect the Hurd system
build.
After some time, "substitute: updating substitutes bla blah" may be
printed (again and again), but no progress seems to be made.
Building the .drv's by hand, such as
./pre-inst-env guix build
/gnu/store/a1nw6yk94darc88n0pdbvrgza8wq31f3-binutils-2.33.1.tar.zst.drv
works fine. I did that for a number of packages. Also, I did not
observe any problems building
After bisecting I found
4a8e5ebfff gnu: binutils: Update to 2.41.
to be the culprit. To be able to revert that, also
8e9573784f gnu: binutils: Use gexps.
must be reverted, which is what I did on hurd-team.
Also, it seems that the Hurd build is broken on core-updates in several
ways. I've been creating patches, see below (also pushed to hurd-team
branch).
I'm completely baffled by this, I've reverted these two commits on
hurd-team for now, trying to get a Hurd system to build.
Greetings,
Janneke
>From 0e1bf5714261de8f25baabca3b826284102b6c40 Mon Sep 17 00:00:00 2001
Message-ID: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.jann...@gnu.org>
From: Janneke Nieuwenhuizen <jann...@gnu.org>
Date: Fri, 12 Jan 2024 13:24:14 +0100
Subject: [PATCH 1/3] gnu: gcc: Fix building cross compiler for the Hurd.
This is a follow-up to commit
d21d596f72ad491937123980e65d3efedc903bd6
gnu: gcc: Support objc, objc++ by default.
* gnu/packages/gcc.scm (gcc-4.7): Only build c,c++ when building for the Hurd.
Change-Id: I21ce5dd30d7ab253e6a46173eb674b55d6c01505
---
gnu/packages/gcc.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ecd88931eb..111b096185 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2022 Greg Hogan <c...@greghogan.com>
;;; Copyright © 2023 Bruno Victal <mi...@makinata.eu>
;;; Copyright © 2023 Maxim Cournoyer <maxim.courno...@gmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -132,9 +133,11 @@ (define-public gcc-4.7
;; contents of (maybe-target-tools).
(list 'quasiquote
(append
- '("--enable-plugin"
- "--enable-languages=c,c++,objc,obj-c++"
- "--disable-multilib"
+ '("--enable-plugin")
+ (if (target-hurd?)
+ '("--enable-languages=c,c++")
+ '("--enable-languages=c,c++,objc,obj-c++"))
+ '("--disable-multilib"
"--with-system-zlib"
;; No pre-compiled libstdc++ headers, to save space.
base-commit: 8e9573784f06ec2af96f9298c6dd4346688888fb
--
2.41.0
>From bb99ace974103c1d9d8fda2da19d76cb5edb20c3 Mon Sep 17 00:00:00 2001
Message-ID: <bb99ace974103c1d9d8fda2da19d76cb5edb20c3.1705149527.git.jann...@gnu.org>
In-Reply-To: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.jann...@gnu.org>
References: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.jann...@gnu.org>
From: Janneke Nieuwenhuizen <jann...@gnu.org>
Date: Sat, 13 Jan 2024 10:46:21 +0100
Subject: [PATCH 2/3] gnu: gnumach-headers: Update to v1.8+git20230410.
* gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20230410.
Change-Id: I2ca1efb8610bbd2fa85b44c60ae065f0323b552c
---
gnu/packages/hurd.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index f697694124..16be1c760b 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2018, 2020-2023 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efr...@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mba...@fastmail.com>
-;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen <jann...@gnu.org>
+;;; Copyright © 2020, 2022, 2023, 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
;;; Copyright © 2020 Ricardo Wurmus <rek...@elephly.net>
;;; Copyright © 2020 Rene Saavedra <pac...@protonmail.com>
;;; Copyright © 2023 Josselin Poiret <d...@jpoiret.xyz>
@@ -59,7 +59,7 @@ (define (hurd-source-url version)
(define-public gnumach-headers
(package
(name "gnumach-headers")
- (version "1.8+git20221224") ;; This is an upstream tag
+ (version "1.8+git20230410") ;; This is an upstream tag
(source
(origin
(method git-fetch)
@@ -69,7 +69,7 @@ (define-public gnumach-headers
(file-name (git-file-name "gnumach" version))
(sha256
(base32
- "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs"))))
+ "1s09256g2ny46idrn8frzs7r51la9ni45bmglmswlsmz9ii7dpi4"))))
(build-system gnu-build-system)
(arguments
`(#:phases
--
2.41.0
>From 78f3a4661f5357434a3b2cf61cb348a185089890 Mon Sep 17 00:00:00 2001
Message-ID: <78f3a4661f5357434a3b2cf61cb348a185089890.1705149527.git.jann...@gnu.org>
In-Reply-To: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.jann...@gnu.org>
References: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.jann...@gnu.org>
From: Janneke Nieuwenhuizen <jann...@gnu.org>
Date: Sat, 13 Jan 2024 10:52:59 +0100
Subject: [PATCH 3/3] gnu: hurd-headers: Update to v0.9.git20231217.
* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20231217.
Change-Id: I1d9739ba912e425e66accfcb56a91ac8efc4fe7c
---
gnu/packages/hurd.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 16be1c760b..7a271a68b0 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -130,10 +130,8 @@ (define-public mig
(license gpl2+)))
(define-public hurd-headers
- ;; This commit is now slightly behind 0.9.git20220818 as this one needs a
- ;; newer glibc
- (let ((revision "2")
- (commit "v0.9.git20230216"))
+ (let ((revision "3")
+ (commit "v0.9.git20230520"))
(package
(name "hurd-headers")
(version commit)
@@ -144,7 +142,7 @@ (define-public hurd-headers
(commit commit)))
(sha256
(base32
- "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv"))
+ "1m0lgk0741f3scib87130w1spc598zbz7gcc946wi7mg97h8d53m"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
--
2.41.0
--
Janneke Nieuwenhuizen <jann...@gnu.org> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
