diff options
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch new file mode 100644 index 0000000000..3290d1108c --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Bug: https://bugs.debian.org/1041124 | ||
2 | From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001 | ||
3 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
4 | Date: Sat, 15 Jul 2023 11:31:55 +0200 | ||
5 | Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14 | ||
6 | |||
7 | New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when building testsuite with this error: | ||
8 | |||
9 | In file included from /usr/include/gtest/gtest-message.h:57, | ||
10 | from /usr/include/gtest/gtest-assertion-result.h:46, | ||
11 | from /usr/include/gtest/gtest.h:64, | ||
12 | from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27: | ||
13 | /usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions less than C++14 are not supported. | ||
14 | 270 | #error C++ versions less than C++14 are not supported. | ||
15 | | ^~~~~ | ||
16 | |||
17 | Thanks Adrian Bunk <bunk@debian.org> for the report and the fix! | ||
18 | --- | ||
19 | CMakeLists.txt | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 014fc3bb..b2e056db 100644 | ||
24 | --- a/CMakeLists.txt | ||
25 | +++ b/CMakeLists.txt | ||
26 | @@ -213,7 +213,7 @@ endif() | ||
27 | |||
28 | add_compile_options( | ||
29 | $<$<COMPILE_LANGUAGE:C>:-std=gnu99> | ||
30 | - $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11> | ||
31 | + $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14> | ||
32 | -Wall | ||
33 | -Wextra | ||
34 | # -pedantic | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb index 9a7b38b495..2d6d1879a7 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ | |||
19 | file://0004-Modify-systemd-config-directory.patch \ | 19 | file://0004-Modify-systemd-config-directory.patch \ |
20 | file://481.patch \ | 20 | file://481.patch \ |
21 | file://482.patch \ | 21 | file://482.patch \ |
22 | file://504.patch \ | ||
22 | " | 23 | " |
23 | SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de" | 24 | SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de" |
24 | 25 | ||