diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-13 15:07:13 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-13 15:34:06 +0200 |
| commit | 628a6c51d40158b92a6d7027f20d9ea2a8db0cca (patch) | |
| tree | 8407f2bb05073aed95a4e5491b270275f29a123a /gnu | |
| parent | 0368d4708cd5a412aab1b2a8bda62e3758c50d24 (diff) | |
| download | guix-628a6c51d40158b92a6d7027f20d9ea2a8db0cca.tar guix-628a6c51d40158b92a6d7027f20d9ea2a8db0cca.tar.gz | |
gnu: QEMU: Fix compatibility with Meson 0.58.
* gnu/packages/patches/qemu-meson-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/virtualization.scm (qemu)[source](patches): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/qemu-meson-compat.patch | 27 | ||||
| -rw-r--r-- | gnu/packages/virtualization.scm | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index db6cd96a40..94a65ea443 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1623,6 +1623,7 @@ dist_patch_DATA = \ %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ + %D%/packages/patches/qemu-meson-compat.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ diff --git a/gnu/packages/patches/qemu-meson-compat.patch b/gnu/packages/patches/qemu-meson-compat.patch new file mode 100644 index 0000000000..e6968c57dc --- /dev/null +++ b/gnu/packages/patches/qemu-meson-compat.patch @@ -0,0 +1,27 @@ +Fix a build failure that occurs with newer versions of Meson when +gdbus-codegen is unavailable. + +Taken from upstream: +https://gitlab.com/qemu-project/qemu/-/commit/5ecfb76ccc056eb6127e44268e475827ae73b9e0 + +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -3341,7 +3341,7 @@ if ! test "$gio" = "no"; then + gio_cflags=$($pkg_config --cflags gio-2.0) + gio_libs=$($pkg_config --libs gio-2.0) + gdbus_codegen=$($pkg_config --variable=gdbus_codegen gio-2.0) +- if [ ! -x "$gdbus_codegen" ]; then ++ if ! has "$gdbus_codegen"; then + gdbus_codegen= + fi + # Check that the libraries actually work -- Ubuntu 18.04 ships +@@ -5704,6 +5704,8 @@ if test "$gio" = "yes" ; then + echo "CONFIG_GIO=y" >> $config_host_mak + echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak + echo "GIO_LIBS=$gio_libs" >> $config_host_mak ++fi ++if test "$gdbus_codegen" != "" ; then + echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak + fi + echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 56be98c8f5..a38d1c5aa1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -152,6 +152,7 @@ (base32 "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47")) (patches (search-patches "qemu-CVE-2021-20203.patch" + "qemu-meson-compat.patch" "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet |