me
/
guix
Archived
1
0
Fork 0
Code

gnu: m4: Skip gnulib stack-overflow tests for the Hurd. 

* gnu/packages/m4.scm (m4)[arguments]: When building for the Hurd, add stage
'skip-stack-overflow-tests'.
Janneke Nieuwenhuizen 2023-05-08 14:09:55 +02:00
parent 399c43d9ed
commit da9e4fd434
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/m4.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -23,7 +24,8 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module (guix utils))
(define-public m4 (define-public m4
(package (package
@ -54,6 +56,14 @@
(substitute* "tests/test-execute.sh" (substitute* "tests/test-execute.sh"
(("4 5 6") (("4 5 6")
"4 6")))) "4 6"))))
,@(if (target-hurd?)
'((add-after 'unpack 'skip-stack-overflow-tests
(lambda _
(substitute* '("tests/test-sigsegv-catch-stackoverflow1.c"
"tests/test-sigsegv-catch-stackoverflow2.c")
(("(^| )main *\\(.*" all)
(string-append all "{\n exit (77);//"))))))
'())
(add-after 'unpack 'configure-shell (add-after 'unpack 'configure-shell
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((/bin/sh (search-input-file (or native-inputs inputs) (let ((/bin/sh (search-input-file (or native-inputs inputs)