summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2024-06-05 10:52:26 +0300
committerKhem Raj <raj.khem@gmail.com>2024-06-06 21:45:26 -0700
commit6a8650ac4b22e69853066e474596c2a1cf40bd25 (patch)
tree43da995d8bae1c4a0146e5267636b601f5fae264
parent2f38b4028d8c6a9eb7ce3fc16db250fbf49dc98d (diff)
downloadmeta-openembedded-6a8650ac4b22e69853066e474596c2a1cf40bd25.tar.gz
lmsensors: fix building with GCC 14
GCC 14 is more strict regarding const pointers conversion. Fix conversion to let lmsensors build with GCC 14. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch36
-rw-r--r--meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
new file mode 100644
index 0000000000..0ff8b3801b
--- /dev/null
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
@@ -0,0 +1,36 @@
1From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
3Date: Fri, 24 May 2024 14:16:21 +0300
4Subject: [PATCH] Fix building with GCC 14
5
6Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
7Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497]
8---
9 prog/sensord/rrd.c | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
13index a531362bddd5..36d685fce514 100644
14--- a/prog/sensord/rrd.c
15+++ b/prog/sensord/rrd.c
16@@ -299,7 +299,7 @@ int rrdInit(void)
17 argv[argc++] = rraBuff;
18 argv[argc] = NULL;
19
20- ret = rrd_create(argc, (char**) argv);
21+ ret = rrd_create(argc, (const char**) argv);
22 if (ret == -1) {
23 sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
24 sensord_args.rrdFile, rrd_get_error());
25@@ -455,7 +455,7 @@ int rrdUpdate(void)
26 const char *argv[] = {
27 "sensord", sensord_args.rrdFile, rrdBuff, NULL
28 };
29- if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
30+ if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
31 sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
32 sensord_args.rrdFile, rrd_get_error());
33 }
34--
352.39.2
36
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
index f956224e18..07027225c5 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast
14 file://fancontrol.init \ 14 file://fancontrol.init \
15 file://sensord.init \ 15 file://sensord.init \
16 file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ 16 file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
17 file://0001-Fix-building-with-GCC-14.patch \
17" 18"
18SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" 19SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
19 20