[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: |
Tue, 26 May 2020 17:18:03 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 312d9a332053118ca002f4d1e3aa43ea588e593c
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") ""))
- branch staging2 created (now 8a7a5dc), guix-commits, 2020/05/26
- 05/63: gnu: MariaDB: Update to 10.1.45., guix-commits, 2020/05/26
- 03/63: gnu: kmod: Disable tests in 'Makefile.in' instead of 'Makefile.am'.,
guix-commits <=
- 02/63: gnu: kmod: Update to 27., guix-commits, 2020/05/26
- 09/63: gnu: utf8proc: Update to 2.5.0., guix-commits, 2020/05/26
- 11/63: gnu: mesa: Update to 20.0.7., guix-commits, 2020/05/26
- 06/63: gnu: postgresql: Update to 10.13., guix-commits, 2020/05/26
- 04/63: gnu: libinput: Update to 1.15.5., guix-commits, 2020/05/26
- 12/63: gnu: libical: Update to 3.0.8., guix-commits, 2020/05/26
- 01/63: Merge branch 'master' into staging, guix-commits, 2020/05/26
- 13/63: gnu: mesa: Build with LLVM 10., guix-commits, 2020/05/26
- 14/63: gnu: cups-filters: Update to 1.27.4., guix-commits, 2020/05/26
- 16/63: gnu: GTK+: Update to 3.24.20., guix-commits, 2020/05/26