2 files changed, 1 insertions, 44 deletions

diff --git a/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch b/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch
deleted file mode 100644
index dcfffb06..00000000
--- a/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 70e8b986fe78f5fbd1dfdef4f02ea9b50c7158db Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 28 Nov 2023 18:34:17 +0100
-Subject: [PATCH] Config.mk: drop -Wdeclaration-after-statement
-
-Such constructs are fully allowed by C99:
-https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Mixed-Labels-and-Declarations.html#Mixed-Labels-and-Declarations
-
-If the flag is present, then building against python 3.12 will fail thusly:
-
-| In file included from /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/Python.h:44,
-|                  from xen/lowlevel/xc/xc.c:8:
-| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/object.h: In function 'Py_SIZE':
-| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/object.h:233:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
-|   233 |     PyVarObject *var_ob = _PyVarObject_CAST(ob);
-|       |     ^~~~~~~~~~~
-| In file included from /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/Python.h:53:
-| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/cpython/longintrepr.h: In function '_PyLong_CompactValue':
-| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/cpython/longintrepr.h:121:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
-|   121 |     Py_ssize_t sign = 1 - (op->long_value.lv_tag & _PyLong_SIGN_MASK);
-|       |     ^~~~~~~~~~
-| cc1: all warnings being treated as errors
-
-Upstream-Status: Submitted [by email to xen-devel@lists.xenproject.org and maintainers printed by get_maintainer.pl]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- Config.mk | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Config.mk b/Config.mk
-index 8bc2bcd5f6..09d5e8ebde 100644
---- a/Config.mk
-+++ b/Config.mk
-@@ -173,8 +173,6 @@ CFLAGS += -std=gnu99
- 
- CFLAGS += -Wall -Wstrict-prototypes
- 
--$(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
--$(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
- $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable)
- $(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs)
- 
diff --git a/recipes-extended/xen/xen-tools_4.18.bb b/recipes-extended/xen/xen-tools_4.18.bb
index 9920c358..5dbe180a 100644
--- a/recipes-extended/xen/xen-tools_4.18.bb
+++ b/recipes-extended/xen/xen-tools_4.18.bb
@@ -1,5 +1,5 @@
 # tag: RELEASE-4.18.0
-SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d"
+SRCREV ?= "4da8ca9cb9cfdb92c9dd09d5270ae16a3b2dbc89"
 
 XEN_REL ?= "4.18"
 XEN_BRANCH ?= "stable-4.18"
@@ -7,7 +7,6 @@ XEN_BRANCH ?= "stable-4.18"
 SRC_URI = " \
     git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
     file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
-    file://0001-Config.mk-drop-Wdeclaration-after-statement.patch \
     "
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"