nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: american-fuzzy-lop: Really build against QEMU 2.3.0. 

* gnu/packages/debug.scm (qemu-2.3.0): New variable.
  (american-fuzzy-lop): Use it instead of QEMU-HEADLESS.
This commit is contained in:
Ludovic Courtès 2015-11-04 09:37:22 +01:00
parent 9e6b9ea4b1
commit 4f14c628dc
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/debug.scm
View File

@ -141,6 +141,24 @@ intended for use by people who discover and report bugs in compilers and other
tools that process C/C++ code.") tools that process C/C++ code.")
(license ncsa))) (license ncsa)))
(define qemu-2.3.0
(package
(inherit qemu-headless)
(version "2.3.0")
(source (origin
(method url-fetch)
(uri (string-append
"http://wiki.qemu-project.org/download/qemu-"
version ".tar.bz2"))
(sha256
(base32
"120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"))))
(arguments
;; XXX: Disable tests because of GTester's rejection of duplicate test
;; names, which wasn't addressed in this version of QEMU.
`(#:tests? #f
,@(package-arguments qemu-headless)))))
(define-public american-fuzzy-lop (define-public american-fuzzy-lop
(let ((machine (match (or (%current-target-system) (let ((machine (match (or (%current-target-system)
(%current-system)) (%current-system))
@ -164,11 +182,11 @@ tools that process C/C++ code.")
(inputs (inputs
`(("custom-qemu" `(("custom-qemu"
;; The afl-qemu tool builds qemu 2.3.0 with a few patches applied. ;; The afl-qemu tool builds qemu 2.3.0 with a few patches applied.
,(package (inherit qemu-headless) ,(package (inherit qemu-2.3.0)
(name "afl-qemu") (name "afl-qemu")
(inputs (inputs
`(("afl-src" ,source) `(("afl-src" ,source)
,@(package-inputs qemu-headless))) ,@(package-inputs qemu-2.3.0)))
;; afl only supports using a single afl-qemu-trace executable, so ;; afl only supports using a single afl-qemu-trace executable, so
;; we only build qemu for the native target. ;; we only build qemu for the native target.
(arguments (arguments
@ -176,7 +194,7 @@ tools that process C/C++ code.")
(list (string-append "--target-list=" ,machine "-linux-user")) (list (string-append "--target-list=" ,machine "-linux-user"))
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
,@(substitute-keyword-arguments (package-arguments qemu-headless) ,@(substitute-keyword-arguments (package-arguments qemu-2.3.0)
((#:phases qemu-phases) ((#:phases qemu-phases)
`(modify-phases ,qemu-phases `(modify-phases ,qemu-phases
(add-after (add-after