guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

45/59: gnu: git-minimal: Support the 64bit Hurd.


From: guix-commits
Subject: 45/59: gnu: git-minimal: Support the 64bit Hurd.
Date: Mon, 11 Nov 2024 09:56:10 -0500 (EST)

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

commit ab55c68442e9638d8c6e6d66732b9056686c52cf
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Nov 8 08:37:30 2024 +0100

    gnu: git-minimal: Support the 64bit Hurd.
    
    * 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 @@
   #: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 @@ Python 3.3 and later, rather than on Python 2.")
               ;; By default 'make install' creates hard links for
               ;; things in 'libexec/git-core', which leads to huge
               ;; nars; see <https://bugs.gnu.org/21949>.
-              "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 @@ Python 3.3 and later, rather than on Python 2.")
                       (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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]