guix-commits
[Top][All Lists]
Advanced

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

20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compilin


From: guix-commits
Subject: 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:32 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit c3a3a4a7619456a60caf4e2dc3be91dc6adc3a2e
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 15:23:53 2021 +0200

    gnu: gamin: Recognise aarch64 as architecture when cross-compiling.
    
    * gnu/packages/gnome.scm
      (gamin)[arguments]<#:phases>{replace-config.sub}: Update 'config.sub'
      when cross-compiling.
      (gamin)[native-inputs]: Add "config" when cross-compiling.
---
 gnu/packages/gnome.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a62667..5e24090 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -62,6 +62,7 @@
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11244,6 +11245,13 @@ repository and commit your work.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         ;; The 'config.sub' is too old to recognise aarch64.
+         ,@(if (and=> (%current-target-system) target-aarch64?)
+               `((add-after 'unpack 'replace-config.sub
+                   (lambda _
+                     (delete-file "config.sub")
+                     (symlink (which "config.sub") "config.sub"))))
+               '())
          (add-after 'unpack 'remove-deprecated-macro
            (lambda _
              (substitute* '("server/gam_node.c"
@@ -11255,7 +11263,10 @@ repository and commit your work.")
     (inputs
      `(("glib" ,glib)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ,@(if (and=> (%current-target-system) target-aarch64?)
+             `(("config" ,config))
+             '())))
     (home-page "https://people.gnome.org/~veillard/gamin/";)
     (synopsis "File alteration monitor")
     (description



reply via email to

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