mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Re-Add automake-1.16.5.

Browse source 
* gnu/packages/autotools.scm (automake): Rename to...
(automake-1.16.5): ...this, and downgrade version to 1.16.5.
[arguments]: Rename phase "skip-test" to "skip-tests", skip 8 more tests
that fail with gcc-14.
[source]:  Move to...
(automake): ...this new variable.
[arguments]: Replace "skip-tests" phase.

Change-Id: Iacc2ca3bc84f0a4b261663b9178922bcb1c18578
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-05 12:52:50 +01:00
parent 02ba05e4dd
commit a15857c3ab
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/autotools.scm
View file

@ -32,6 +32,7 @@
(define-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (gnu packages)
#:use-module (gnu packages gcc)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages m4)
@ -317,17 +318,17 @@ (define-public autobuild
(home-page "https://josefsson.org/autobuild/")
(license gpl3+)))
(define-public automake
(define-public automake-1.16.5
(package
(name "automake")
(version "1.17")
(version "1.16.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/automake/automake-"
version ".tar.xz"))
(sha256
(base32
"146rkdcwri2dkwn3pjrjs9v0wm4xyav9vvq4yw5vj4qy87yc2849"))
"0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"))
(patches
(search-patches "automake-skip-amhello-tests.patch"))))
(build-system gnu-build-system)
@ -359,16 +360,23 @@ (define-public automake
;; that occur during the test suite.
(setenv "SHELL" sh)
(setenv "CONFIG_SHELL" sh))))
(add-before 'check 'skip-test
(add-before 'check 'skip-tests
(lambda _
(substitute*
;; This test requires 'etags' and fails if it's missing.
;; Skip it.
'("t/tags-lisp-space.sh"
;; This test fails, probably a timestamp thing:
;; make: Nothing to be done for 'all'.
"t/remake-aclocal-version-mismatch.sh")
(("^#!.*" all)
(string-append all "exit 77;\n")))))
;; These tests fail with gcc-14
"t/c-demo.sh"
"t/depcomp-auto.tap"
"t/depcomp-cpp.tap"
"t/depcomp-dashmstdout.tap"
"t/depcomp-gcc.tap"
"t/dist-vs-built-sources.sh"
"t/link_cond.sh"
"t/subobj-clean-pr10697.sh")
(("^#!.*" all)
(string-append all "exit 77;\n")))))
#$@(if (%current-target-system)
#~((add-after 'install 'patch-non-shebang-references
@ -430,6 +438,34 @@ (define (starts-with-shebang? file)
Makefile, simplifying the entire process for the developer.")
(license gpl2+))) ; some files are under GPLv3+
(define-public automake
(package/inherit automake-1.16.5
(name "automake")
(version "1.17")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/automake/automake-"
version ".tar.xz"))
(sha256
(base32
"146rkdcwri2dkwn3pjrjs9v0wm4xyav9vvq4yw5vj4qy87yc2849"))
(patches
(search-patches "automake-skip-amhello-tests.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments automake-1.16.5)
((#:phases phases)
#~(modify-phases #$phases
(replace 'skip-tests
(lambda _
(substitute*
;; This test requires 'etags' and fails if it's missing.
'("t/tags-lisp-space.sh"
;; This test fails, probably a timestamp thing:
;; make: Nothing to be done for 'all'.
"t/remake-aclocal-version-mismatch.sh")
(("^#!.*" all)
(string-append all "exit 77;\n")))))))))))
(define-public libtool
(package
(name "libtool")