diff options
author | 2023-02-19 20:30:48 +0100 | |
---|---|---|
committer | 2023-02-20 15:17:55 +0000 | |
commit | 31245df3061c1a913bffe5e11ad6ac7fa9c83915 (patch) | |
tree | 8e6312243ddba544bdd345878873a8c7b3e50f67 | |
parent | ca3cbf8de4c855dda08d73fb06886d4b06676eaf (diff) | |
download | openembedded-core-31245df3061c1a913bffe5e11ad6ac7fa9c83915.tar.gz |
dbus: upgrade 1.14.4 -> 1.14.6
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r-- | meta/recipes-core/dbus/dbus/0001-Define-_DBUS_ALIGNOF-using-_Alignof-when-using-C11-o.patch | 42 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.14.6.bb (renamed from meta/recipes-core/dbus/dbus_1.14.4.bb) | 5 |
2 files changed, 2 insertions, 45 deletions
diff --git a/meta/recipes-core/dbus/dbus/0001-Define-_DBUS_ALIGNOF-using-_Alignof-when-using-C11-o.patch b/meta/recipes-core/dbus/dbus/0001-Define-_DBUS_ALIGNOF-using-_Alignof-when-using-C11-o.patch deleted file mode 100644 index 7b4e26f99e..0000000000 --- a/meta/recipes-core/dbus/dbus/0001-Define-_DBUS_ALIGNOF-using-_Alignof-when-using-C11-o.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c3e2c873ffa8e89b5f83dccc4e4e35dfcea633cb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 14 Jan 2023 12:39:43 -0800 -Subject: [PATCH] Define _DBUS_ALIGNOF using _Alignof when using C11 or newer - -WG14 N2350 made very clear that it is an UB having type definitions -within "offsetof" [1]. This patch changes the implementation of macro -_DBUS_ALIGNOF to builtin "_Alignof" to avoid undefined behavior. - -clang 16+ has started to diagnose this [2] - -Fixes build when using -std >= gnu11 and using clang16+ - -[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm -[2] https://reviews.llvm.org/D133574 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/389] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dbus/dbus-internals.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h -index cc98c92a..2387752d 100644 ---- a/dbus/dbus-internals.h -+++ b/dbus/dbus-internals.h -@@ -201,8 +201,12 @@ void _dbus_real_assert_not_reached (const char *explanation, - ((intptr_t) ((unsigned char*) &((struct_type*) 0)->member)) - #endif - -+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__cplusplus) -+#define _DBUS_ALIGNOF(type) _Alignof(type) -+#else - #define _DBUS_ALIGNOF(type) \ - (_DBUS_STRUCT_OFFSET (struct { char _1; type _2; }, _2)) -+#endif - - #if defined(DBUS_DISABLE_CHECKS) || defined(DBUS_DISABLE_ASSERT) - /* this is an assert and not an error, but in the typical --disable-checks case (you're trying --- -2.39.0 - diff --git a/meta/recipes-core/dbus/dbus_1.14.4.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb index ee05496203..a6e18a92cb 100644 --- a/meta/recipes-core/dbus/dbus_1.14.4.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -13,11 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6423dcd74d7be9715b0db247fd889da3 \ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://run-ptest \ file://tmpdir.patch \ - file://0001-Define-_DBUS_ALIGNOF-using-_Alignof-when-using-C11-o.patch \ file://dbus-1.init \ -" + " -SRC_URI[sha256sum] = "7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e" +SRC_URI[sha256sum] = "fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ |