diff options
author | Nguyen Dat Tho <tho3.nguyen@lge.com> | 2025-04-09 18:15:17 +0900 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-04-10 08:31:03 -0700 |
commit | e62c16c3e47a5fd276417f0cf9895df59f888719 (patch) | |
tree | a93d639fedbd034c18ec596fe5933239f0d8fb58 | |
parent | 7be42e05de3021d7a742a85a7303d8d86520342b (diff) | |
download | meta-openembedded-e62c16c3e47a5fd276417f0cf9895df59f888719.tar.gz |
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>
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch | 34 | ||||
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..00105fb844 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
3 | Date: Wed, 9 Apr 2025 17:33:25 +0900 | ||
4 | Subject: [PATCH] Fix build with gcc-15 | ||
5 | |||
6 | To fix the following error: | ||
7 | In file included from string_matching.cpp:1: | ||
8 | ./string_matching.h:10:18: error: 'uint16_t' does not name a type | ||
9 | 10 | extern const uint16_t PATTERN_LIMIT; | ||
10 | | ^~~~~~~~ | ||
11 | ./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>' | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50] | ||
14 | |||
15 | Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
16 | --- | ||
17 | user/drbdmon/string_matching.h | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h | ||
21 | index 9b3918fe..b783ba48 100644 | ||
22 | --- a/user/drbdmon/string_matching.h | ||
23 | +++ b/user/drbdmon/string_matching.h | ||
24 | @@ -4,6 +4,7 @@ | ||
25 | #include <string> | ||
26 | #include <memory> | ||
27 | #include <stdexcept> | ||
28 | +#include <cstdint> | ||
29 | |||
30 | namespace string_matching | ||
31 | { | ||
32 | -- | ||
33 | 2.34.1 | ||
34 | |||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb index d9f1ae3f77..ab515603f5 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot | |||
11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ | 11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ |
12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ | 12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ |
13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ |
14 | file://0001-Fix-build-with-gcc-15.patch \ | ||
14 | " | 15 | " |
15 | SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9" | 16 | SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9" |
16 | SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc" | 17 | SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc" |