guix-commits
[Top][All Lists]
Advanced

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

03/05: gnu: guile: Do not warn about 'madvise' ENOSYS on GNU/Hurd.


From: guix-commits
Subject: 03/05: gnu: guile: Do not warn about 'madvise' ENOSYS on GNU/Hurd.
Date: Sun, 16 Dec 2018 10:28:22 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit ee8ee74820711fd1a517dbd082629d5182e190a9
Author: Ludovic Courtès <address@hidden>
Date:   Sun Dec 16 15:49:41 2018 +0100

    gnu: guile: Do not warn about 'madvise' ENOSYS on GNU/Hurd.
    
    * gnu/packages/guile.scm (guile-2.2)[arguments]: When 'hurd-target?'
    returns true, add 'allow-madvise-ENOSYS' phase.
---
 gnu/packages/guile.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index c271c4b..5a3ce44 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages flex)
@@ -288,7 +289,19 @@ without requiring the source code to be rewritten.")
                    (substitute* "module/Makefile.in"
                      (("language/elisp/boot\\.el")
                       "\n"))
-                   #t)))))
+                   #t))
+               ,@(if (hurd-target?)
+                     `((add-after 'unpack 'allow-madvise-ENOSYS
+                         (lambda _
+                           ;; Do not warn about ENOSYS on 'madvise'.  This is
+                           ;; what Guile commit
+                           ;; 45e4ace6603e00b297e6542362273041aebe7305 does.
+                           ;; TODO: Remove for Guile >= 2.2.5.
+                           (substitute* "libguile/vm.c"
+                             (("perror \\(\"madvise failed\"\\)")
+                              "if (errno != ENOSYS) perror (\"madvised 
failed\");"))
+                           #t)))
+                     '()))))
          (package-arguments guile-2.0)))))
 
 (define-public guile-2.2/fixed



reply via email to

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