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

gnu: qemu: Upgrade to 1.5.1. 

* gnu/packages/qemu.scm (qemu-kvm): Add `--cc' configure option.
  Add PIXMAN and ALSA-LIB as inputs.
  (qemu): Upgrade to 1.5.1  Remove autotool hack for pixman.  Patch
  tests/libqtest.c.  Remove Autoconf, Automake, and Libtool from the
  inputs.  Fix `home-page'.
This commit is contained in:
Ludovic Courtès 2013-07-03 01:04:57 +02:00
parent 423002544d
commit 2b2fdd45bb
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/qemu.scm
View File

@ -34,6 +34,7 @@
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages samba) #:use-module (gnu packages samba)
#:use-module (gnu packages xorg)
#:use-module (gnu packages perl)) #:use-module (gnu packages perl))
(define-public qemu-kvm (define-public qemu-kvm
@ -62,6 +63,7 @@
(setenv "LDFLAGS" "-lrt") (setenv "LDFLAGS" "-lrt")
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--cc=" (which "gcc"))
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--smbd=" samba (string-append "--smbd=" samba
"/sbin/smbd"))))) "/sbin/smbd")))))
@ -74,11 +76,12 @@
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("libpng" ,libpng) ("libpng" ,libpng)
("libjpeg" ,libjpeg-8) ("libjpeg" ,libjpeg-8)
("pixman" ,pixman)
;; ("vde2" ,vde2) ;; ("vde2" ,vde2)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
;; ("pciutils" ,pciutils) ;; ("pciutils" ,pciutils)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
;; ("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
;; ("SDL" ,SDL) ;; ("SDL" ,SDL)
("zlib" ,zlib) ("zlib" ,zlib)
("attr" ,attr) ("attr" ,attr)
@ -113,7 +116,7 @@ underway to get the required changes upstream.")
;; The real one, with a complete target list. ;; The real one, with a complete target list.
(package (inherit qemu-kvm) (package (inherit qemu-kvm)
(name "qemu") (name "qemu")
(version "1.3.1") (version "1.5.1")
(location (source-properties->location (current-source-location))) (location (source-properties->location (current-source-location)))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -121,31 +124,18 @@ underway to get the required changes upstream.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip")))) "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qemu-kvm) (substitute-keyword-arguments (package-arguments qemu-kvm)
((#:phases phases) ((#:phases phases)
`(alist-cons-before `(alist-cons-before
'build 'pre-build 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libtool (assoc-ref inputs "libtool")) (substitute* "tests/libqtest.c"
(pkg-config (assoc-ref inputs "pkg-config"))) (("/bin/sh") (which "sh"))))
;; XXX: For lack of generic search path handling.
(setenv "ACLOCAL_PATH"
(format #f "~a/share/aclocal:~a/share/aclocal"
libtool pkg-config)))
;; For pixman's `configure' script.
(setenv "CONFIG_SHELL" (which "bash"))
(substitute* "pixman/configure.ac"
(("AM_CONFIG_HEADER") "AC_CONFIG_HEADERS")))
,phases)))) ,phases))))
(native-inputs `(("autoconf" ,autoconf-wrapper) ; for "pixman" (native-inputs `(("perl" ,perl)))
("automake" ,automake) (home-page "http://www.qemu-project.org")
("libtool" ,libtool)
("libtool-bin" ,libtool "bin")
("perl" ,perl)))
(description (description
"QEMU is a generic and open source machine emulator and virtualizer. "QEMU is a generic and open source machine emulator and virtualizer.