17/17: Revert "gnu: binutils: Update to 2.41."

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit 01f29ae055ac628a403100ede55666b7be83907f
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Jan 13 12:48:22 2024 +0100

    Revert "gnu: binutils: Update to 2.41."
    
    This makes guix system build bare-hurd.tmpl hang.
    
    This reverts commit fd4045d81dc98e51ac5fb236432f8f80aefada08.
    
    Change-Id: Id2aefe6ec6393302d85358c54f31bb58f6943599
---
 gnu/packages/base.scm         | 35 +++++++++++++++++--------
 gnu/packages/commencement.scm | 61 +++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f985009665..bacd820a3a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
@@ -584,14 +584,14 @@ change.  GNU make offers many powerful extensions over 
the standard utility.")
 (define-public binutils
   (package
    (name "binutils")
-   (version "2.41")
+   (version "2.38")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/binutils/binutils-"
                           version ".tar.bz2"))
       (sha256
-       (base32 "02xkm9xgcrqhln742636nm43yzrpjkhqj0z64h03gf7pab0bxi54"))
+       (base32 "1y0fb4qgxaxfyf81x9fqq9w5609mkah0b7wm1f7ab9kpy0fcf3h7"))
       (patches (search-patches "binutils-loongson-workaround.patch"))))
    (build-system gnu-build-system)
    (arguments
@@ -622,11 +622,16 @@ change.  GNU make offers many powerful extensions over 
the standard utility.")
                           "--enable-lto"
                           "--enable-separate-code"
                           "--enable-threads")
-
-      ;; For some reason, the build machinery insists on rebuilding .info
-      ;; files, even though they're already provided by the tarball.
+      ;; XXX: binutils 2.38 was released without generated manuals:
+      ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28909>.  To avoid
+      ;; a circular dependency on texinfo, prevent the build system from
+      ;; creating the manuals by calling "true" instead of "makeinfo" ...
       #:make-flags '("MAKEINFO=true")))
-   (native-inputs (list bison))                   ;needed to build 'gprofng'
+
+   ;; ... and "hide" this package such that users who install binutils get
+   ;; the version with documentation defined below.
+   (properties '((hidden? . #t)))
+
    (synopsis "Binary utilities: bfd gas gprof ld")
    (description
     "GNU Binutils is a collection of tools for working with binary files.
@@ -638,6 +643,16 @@ included.")
    (license gpl3+)
    (home-page "https://www.gnu.org/software/binutils/";)))
 
+(define-public binutils+documentation
+  (package/inherit binutils
+    (native-inputs
+     (list texinfo))
+    (arguments
+     (substitute-keyword-arguments (package-arguments binutils)
+       ((#:make-flags flags ''())
+        ''())))
+    (properties '())))
+
 ;; FIXME: ath9k-firmware-htc-binutils.patch do not apply on 2.34 because of a
 ;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream).
 ;; Keep this version around until the patch is updated.
@@ -656,11 +671,10 @@ included.")
    (arguments
     (substitute-keyword-arguments (package-arguments binutils)
       ((#:make-flags _ ''()) ''())))
-   (native-inputs '())
    (properties '())))
 
 (define-public binutils-gold
-  (package/inherit binutils
+  (package/inherit binutils+documentation
     (name "binutils-gold")
     (arguments
      (substitute-keyword-arguments (package-arguments binutils)
@@ -681,8 +695,7 @@ included.")
                      (substitute* "gold/Makefile.in"
                        ((" testsuite") " ")))))
                '())))))
-    (native-inputs (modify-inputs (package-native-inputs binutils)
-                     (append bc)))))
+    (native-inputs (list bc))))
 
 (define* (make-ld-wrapper name #:key
                           (target (const #f))
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a70cf02a6f..51c26339ef 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
@@ -2273,10 +2273,8 @@ exec " gcc "/bin/" program
 
        ,@(substitute-keyword-arguments (package-arguments binutils)
            ((#:configure-flags cf)
-            `(append (list ,(string-append "--target=" (boot-triplet))
-                           "--disable-gprofng")   ;requires Bison
-                     ,cf)))))
-    (native-inputs '())                           ;no Bison
+            `(cons ,(string-append "--target=" (boot-triplet))
+                   ,cf)))))
     (inputs (%boot0-inputs))))
 
 (define libstdc++-boot0
@@ -3148,6 +3146,27 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
     ("gcc" ,gcc-boot0-wrapped)
     ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" 
"linux-libre-headers"))))
 
+(define binutils-final
+  (package
+    (inherit binutils)
+    (source (bootstrap-origin (package-source binutils)))
+    (arguments
+     `(#:guile ,%bootstrap-guile
+       #:implicit-inputs? #f
+       #:allowed-references
+       ,@(match (%current-system)
+         ((? target-powerpc?)
+          `(("out" ,glibc-final ,static-bash-for-glibc)))
+         (_
+          `(("out" ,glibc-final))))
+       ,@(package-arguments binutils)))
+    (inputs
+     (match (%current-system)
+       ((? target-powerpc?)
+        `(("bash" ,static-bash-for-glibc)
+          ,@(%boot2-inputs)))
+       (_ (%boot2-inputs))))))
+
 (define libstdc++
   ;; Intermediate libstdc++ that will allow us to build the final GCC
   ;; (remember that GCC-BOOT0 cannot build libstdc++.)
@@ -3177,38 +3196,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
       (inputs (%boot2-inputs))
       (synopsis "GNU C++ standard library (intermediate)"))))
 
-(define binutils-final
-  (package
-    (inherit binutils)
-    (source (bootstrap-origin (package-source binutils)))
-    (arguments
-     `(#:guile ,%bootstrap-guile
-       #:implicit-inputs? #f
-       #:allowed-references
-       ("out"
-        ,glibc-final
-        ,(this-package-native-input "libstdc++")
-        ,@(if (target-powerpc? (%current-system))
-              (list static-bash-for-glibc)
-              '()))
-
-       ,@(substitute-keyword-arguments (package-arguments binutils)
-           ((#:configure-flags flags #~'())
-            ;; For gprofng, tell the build system where to look for libstdc++.
-            #~(append #$flags
-                      (list (string-append
-                             "LDFLAGS=-L"
-                             #$(this-package-native-input "libstdc++")
-                             "/lib")))))))
-    (native-inputs (list bison-boot0
-                         libstdc++))              ;for gprofng
-    (inputs
-     (match (%current-system)
-       ((? target-powerpc?)
-        `(("bash" ,static-bash-for-glibc)
-          ,@(%boot2-inputs)))
-       (_ (%boot2-inputs))))))
-
 (define zlib-final
   ;; Zlib used by GCC-FINAL.
   (package