drbd-utils: Fix build with gcc-15

To fix error: http://errors.yoctoproject.org/Errors/Details/851808/
In file included from string_matching.cpp:1:
./string_matching.h:10:18: error: 'uint16_t' does not name a type
   10 |     extern const uint16_t   PATTERN_LIMIT;
      |                  ^~~~~~~~
./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'

Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Nguyen Dat Tho 2025-04-09 18:15:17 +09:00 committed by Khem Raj
parent 7be42e05de
commit e62c16c3e4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,34 @@
From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001
From: Nguyen Dat Tho <tho3.nguyen@lge.com>
Date: Wed, 9 Apr 2025 17:33:25 +0900
Subject: [PATCH] Fix build with gcc-15
To fix the following error:
In file included from string_matching.cpp:1:
./string_matching.h:10:18: error: 'uint16_t' does not name a type
10 | extern const uint16_t PATTERN_LIMIT;
| ^~~~~~~~
./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50]
Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
---
user/drbdmon/string_matching.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h
index 9b3918fe..b783ba48 100644
--- a/user/drbdmon/string_matching.h
+++ b/user/drbdmon/string_matching.h
@@ -4,6 +4,7 @@
#include <string>
#include <memory>
#include <stdexcept>
+#include <cstdint>
namespace string_matching
{
--
2.34.1

View File

@ -11,6 +11,7 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot
git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \
file://0001-drbdmon-add-LDFLAGS-when-linking.patch \
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
file://0001-Fix-build-with-gcc-15.patch \
"
SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9"
SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc"