guix-commits
[Top][All Lists]
Advanced

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

03/63: gnu: kmod: Disable tests in 'Makefile.in' instead of 'Makefile.am


From: guix-commits
Subject: 03/63: gnu: kmod: Disable tests in 'Makefile.in' instead of 'Makefile.am'.
Date: Mon, 25 May 2020 15:15:18 -0400 (EDT)

mbakke pushed a commit to branch staging2
in repository guix.

commit 4d79117a61c034cf6976787fad92cf9f0357b586
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 15 01:26:59 2020 +0200

    gnu: kmod: Disable tests in 'Makefile.in' instead of 'Makefile.am'.
    
    This avoids a build failure because the package was bootstrapped with an 
older
    version of Automake.  By substituting the .in file we avoid triggering the
    Autoconf machinery.
    
    * gnu/packages/linux.scm (kmod)[arguments]: Change the 'disable-tests' phase
    to substitute "Makefile.in" instead of "Makefile.am".
    [native-inputs]: Remove AUTOMAKE and AUTOCONF.
---
 gnu/packages/linux.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fb1ed8d..3fd902e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2950,9 +2950,7 @@ to use Linux' inotify mechanism, which allows file 
accesses to be monitored.")
               (patches (search-patches "kmod-module-directory.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("automake" ,automake)
-       ("autoconf" ,autoconf)
-       ("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("xz" ,xz)
        ("zlib" ,zlib)))
@@ -2964,7 +2962,7 @@ to use Linux' inotify mechanism, which allows file 
accesses to be monitored.")
          (add-after 'unpack 'disable-tests
            (lambda _
              ;; XXX: These tests need '--sysconfdir=/etc' to pass.
-             (substitute* "Makefile.am"
+             (substitute* "Makefile.in"
                (("testsuite/test-modprobe") "")
                (("testsuite/test-depmod") "")
                (("testsuite/test-blacklist") ""))



reply via email to

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