diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch b/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch index 1f20077883..8bffc31293 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch | |||
@@ -26,20 +26,20 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
26 | configure | 4 +++- | 26 | configure | 4 +++- |
27 | 1 file changed, 3 insertions(+), 1 deletion(-) | 27 | 1 file changed, 3 insertions(+), 1 deletion(-) |
28 | 28 | ||
29 | diff --git a/configure b/configure | 29 | Index: qemu-6.0.0/configure |
30 | index 18c26e0389..4c36e221d3 100755 | 30 | =================================================================== |
31 | --- a/configure | 31 | --- qemu-6.0.0.orig/configure |
32 | +++ b/configure | 32 | +++ qemu-6.0.0/configure |
33 | @@ -3496,7 +3496,7 @@ if $pkg_config --atleast-version=$glib_req_ver gio-2.0; then | 33 | @@ -3366,7 +3366,7 @@ if ! test "$gio" = "no"; then |
34 | gio_cflags=$($pkg_config --cflags gio-2.0) | 34 | gio_cflags=$($pkg_config --cflags gio-2.0) |
35 | gio_libs=$($pkg_config --libs gio-2.0) | 35 | gio_libs=$($pkg_config --libs gio-2.0) |
36 | gdbus_codegen=$($pkg_config --variable=gdbus_codegen gio-2.0) | 36 | gdbus_codegen=$($pkg_config --variable=gdbus_codegen gio-2.0) |
37 | - if [ ! -x "$gdbus_codegen" ]; then | 37 | - if [ ! -x "$gdbus_codegen" ]; then |
38 | + if ! has "$gdbus_codegen"; then | 38 | + if ! has "$gdbus_codegen"; then |
39 | gdbus_codegen= | 39 | gdbus_codegen= |
40 | fi | 40 | fi |
41 | # Check that the libraries actually work -- Ubuntu 18.04 ships | 41 | # Check that the libraries actually work -- Ubuntu 18.04 ships |
42 | @@ -6172,6 +6172,8 @@ if test "$gio" = "yes" ; then | 42 | @@ -5704,6 +5704,8 @@ if test "$gio" = "yes" ; then |
43 | echo "CONFIG_GIO=y" >> $config_host_mak | 43 | echo "CONFIG_GIO=y" >> $config_host_mak |
44 | echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak | 44 | echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak |
45 | echo "GIO_LIBS=$gio_libs" >> $config_host_mak | 45 | echo "GIO_LIBS=$gio_libs" >> $config_host_mak |
@@ -48,6 +48,3 @@ index 18c26e0389..4c36e221d3 100755 | |||
48 | echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak | 48 | echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak |
49 | fi | 49 | fi |
50 | echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak | 50 | echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak |
51 | -- | ||
52 | 2.24.0 | ||
53 | |||