diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-09 11:36:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-09 14:01:31 +0200 |
| commit | e1f88ff0ab1c5bb6c234d27ab0887a73a496073e (patch) | |
| tree | 0ab164dea68ee6aa588fe6bb4b218c47f165f7b6 /gnu/packages/patches | |
| parent | 57e544e8f7f0c907bb1ea3b4432a9a3d3da57365 (diff) | |
| download | guix-e1f88ff0ab1c5bb6c234d27ab0887a73a496073e.tar.gz guix-e1f88ff0ab1c5bb6c234d27ab0887a73a496073e.zip | |
gnu: qemu: Upgrade to 1.7.1; add virtfs support.
* gnu/packages/qemu.scm (qemu-headless): Upgrade to 1.7.1.
[source]: Remove 'patches' field.
[arguments]: Add --enable-virtfs configure flag.
[inputs]: Add libcap and attr.
* gnu/packages/patches/qemu-make-4.0.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qemu-make-4.0.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/qemu-make-4.0.patch b/gnu/packages/patches/qemu-make-4.0.patch deleted file mode 100644 index 47bdc76b8a..0000000000 --- a/gnu/packages/patches/qemu-make-4.0.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 |