diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-28 04:05:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:48:07 -0400 |
| commit | ecfe88b76496c62fad4f6b6c593318378cebba22 (patch) | |
| tree | 2d15d9311c27a76ff22edf870c448ce85e40db3b /gnu/packages/virtualization.scm | |
| parent | caf4c7c8bd6317e633bebc475d8bb4f532c8d6c3 (diff) | |
| download | guix-ecfe88b76496c62fad4f6b6c593318378cebba22.tar guix-ecfe88b76496c62fad4f6b6c593318378cebba22.tar.gz | |
gnu: qemu: Fix build with glibc-2.27.
* gnu/packages/patches/qemu-glibc-2.27.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/virtualization.scm (qemu)[source]: Add patch.
[native-inputs]: Add flex and bison.
* gnu/packages/bootloaders.scm (qemu-minimal-2.10)[source]: Add patch.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 44a4ed2920..761aab4071 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> @@ -29,6 +29,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -37,6 +38,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -90,7 +92,8 @@ version ".tar.xz")) (sha256 (base32 - "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca")))) + "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca")) + (patches (search-patches "qemu-glibc-2.27.patch")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -192,6 +195,8 @@ exec smbd $@"))) ("zlib" ,zlib))) (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) + ("flex" ,flex) + ("bison" ,bison) ("pkg-config" ,pkg-config) ("python" ,python-2) ; incompatible with Python 3 according to error message ("texinfo" ,texinfo))) |