diff mbox series

[1/2] valgrind: Include missing <cstdint>

Message ID 20230126174614.2427414-1-raj.khem@gmail.com
State Accepted, archived
Commit 01698350086cce9ca21cd31f615a6eb49fabe6dc
Headers show
Series [1/2] valgrind: Include missing <cstdint> | expand

Commit Message

Khem Raj Jan. 26, 2023, 5:46 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...01-drd-tests-Include-missing-cstdint.patch | 34 +++++++++++++++++++
 .../valgrind/valgrind_3.20.0.bb               |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch
new file mode 100644
index 0000000000..fbee24a538
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch
@@ -0,0 +1,34 @@ 
+From 687d9fb9e3de832379680e9d5268331011c92afa Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 26 Jan 2023 08:53:26 -0800
+Subject: [PATCH] drd/tests: Include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer
+transitively included [1]. Explicitly include it for uint{32,64}_t.
+
+Fixes
+tsan_thread_wrappers_pthread.h:91:9: error: 'int64_t' does not name a type
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=464859]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ drd/tests/tsan_thread_wrappers_pthread.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h
+index f15e6ad..4cc8062 100644
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,6 +55,7 @@
+ #define NO_TLS
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ using namespace std;
+ 
+-- 
+2.39.1
+
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb
index 1e1f0ccdd3..701dbf3833 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb
@@ -39,6 +39,7 @@  SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
            file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
            file://0001-docs-Disable-manual-validation.patch \
+           file://0001-drd-tests-Include-missing-cstdint.patch \
            "
 SRC_URI[sha256sum] = "8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6"
 UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"