diff options
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/qemu-make-4.0.patch | 32 | ||||
| -rw-r--r-- | gnu/packages/qemu.scm | 5 |
3 files changed, 36 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index fcaaced228..cd46753dcc 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -265,6 +265,7 @@ dist_patch_DATA = \ gnu/packages/patches/pspp-tests.patch \ gnu/packages/patches/pulseaudio-test-timeouts.patch \ gnu/packages/patches/python-fix-dbm.patch \ + gnu/packages/patches/qemu-make-4.0.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/qt4-tests.patch \ gnu/packages/patches/readline-link-ncurses.patch \ diff --git a/gnu/packages/patches/qemu-make-4.0.patch b/gnu/packages/patches/qemu-make-4.0.patch new file mode 100644 index 0000000000..47bdc76b8a --- /dev/null +++ b/gnu/packages/patches/qemu-make-4.0.patch @@ -0,0 +1,32 @@ +Allow compilation with GNU Make 4.0. +Patch from <http://lists.gnu.org/archive/html/qemu-devel/2013-10/msg02758.html>. +Anaylsis at <http://lists.gnu.org/archive/html/bug-make/2013-10/msg00151.html>. + +--- a/configure ++++ b/configure +@@ -308,6 +308,9 @@ query_pkg_config() { + pkg_config=query_pkg_config + sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" + ++# If the user hasn't specified ARFLAGS, default to 'rv', just as make does. ++ARFLAGS="${ARFLAGS-rv}" ++ + # default flags for all hosts + QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" + QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" +@@ -3664,6 +3667,7 @@ echo "C compiler $cc" + echo "Host C compiler $host_cc" + echo "C++ compiler $cxx" + echo "Objective-C compiler $objcc" ++echo "ARFLAGS $ARFLAGS" + echo "CFLAGS $CFLAGS" + echo "QEMU_CFLAGS $QEMU_CFLAGS" + echo "LDFLAGS $LDFLAGS" +@@ -4239,6 +4243,7 @@ echo "HOST_CC=$host_cc" >> $config_host_mak + echo "CXX=$cxx" >> $config_host_mak + echo "OBJCC=$objcc" >> $config_host_mak + echo "AR=$ar" >> $config_host_mak ++echo "ARFLAGS=$ARFLAGS" >> $config_host_mak + echo "AS=$as" >> $config_host_mak + echo "CPP=$cpp" >> $config_host_mak + echo "OBJCOPY=$objcopy" >> $config_host_mak diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 406d4d12af..c59e0c0695 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -43,14 +43,15 @@ ;; This is QEMU without GUI support. (package (name "qemu-headless") - (version "1.5.1") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "http://wiki.qemu-project.org/download/qemu-" version ".tar.bz2")) (sha256 (base32 - "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac")))) + "152jc18mjs543k8ggbcwgra8d0zw81z0lcc1r0iq4iqhm926ywzw")) + (patches (list (search-patch "qemu-make-4.0.patch"))))) (build-system gnu-build-system) (arguments '(#:phases (alist-replace |