me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2020-05-15 01:26:59 +02:00 committed by Marius Bakke
parent ddcfc46796
commit 312d9a3320
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/linux.scm
View File

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