diff options
| author | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
| commit | 0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b (patch) | |
| tree | 8796bb011e021bf01fe5cb15c70641ee0c0ed5f0 /gnu/packages/patches/qemu-meson-compat.patch | |
| parent | 641b31de5e9716ff8bd088f4834c98d4a664b55a (diff) | |
| parent | 1961b28445080c7b9fb8bf5291ac9a814303522a (diff) | |
| download | guix-patches-0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b.tar guix-patches-0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b.tar.gz | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/patches/qemu-meson-compat.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-meson-compat.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gnu/packages/patches/qemu-meson-compat.patch b/gnu/packages/patches/qemu-meson-compat.patch deleted file mode 100644 index e6968c57dc..0000000000 --- a/gnu/packages/patches/qemu-meson-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 |