diff mbox series

[meta-oe] lmsensors: fix building with GCC 14

Message ID 20240524115815.2501861-1-dmitry.baryshkov@linaro.org
State Accepted
Headers show
Series [meta-oe] lmsensors: fix building with GCC 14 | expand

Commit Message

Dmitry Baryshkov May 24, 2024, 11:58 a.m. UTC 
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>
---
 .../0001-Fix-building-with-GCC-14.patch       | 36 +++++++++++++++++++
 .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch

Comments

Khem Raj May 24, 2024, 2:10 p.m. UTC | #1 
On Fri, May 24, 2024 at 4:58 AM Dmitry Baryshkov via
lists.openembedded.org <dbaryshkov=gmail.com@lists.openembedded.org>
wrote:
>
> 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>
> ---
>  .../0001-Fix-building-with-GCC-14.patch       | 36 +++++++++++++++++++
>  .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb |  1 +
>  2 files changed, 37 insertions(+)
>  create mode 100644 meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
>
> 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 000000000000..73938e257708
> --- /dev/null
> +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
> @@ -0,0 +1,36 @@
> +From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
> +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> +Date: Fri, 24 May 2024 14:16:21 +0300
> +Subject: [PATCH] Fix building with GCC 14
> +
> +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> +Upstream-Status: Pending

This is a good patch to submit upstream as well please open a PR at
https://github.com/lm-sensors/lm-sensors/pulls

> +---
> + prog/sensord/rrd.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
> +index a531362bddd5..36d685fce514 100644
> +--- a/prog/sensord/rrd.c
> ++++ b/prog/sensord/rrd.c
> +@@ -299,7 +299,7 @@ int rrdInit(void)
> +               argv[argc++] = rraBuff;
> +               argv[argc] = NULL;
> +
> +-              ret = rrd_create(argc, (char**) argv);
> ++              ret = rrd_create(argc, (const char**) argv);
> +               if (ret == -1) {
> +                       sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
> +                                 sensord_args.rrdFile, rrd_get_error());
> +@@ -455,7 +455,7 @@ int rrdUpdate(void)
> +               const char *argv[] = {
> +                       "sensord", sensord_args.rrdFile, rrdBuff, NULL
> +               };
> +-              if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
> ++              if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
> +                       sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
> +                                 sensord_args.rrdFile, rrd_get_error());
> +               }
> +--
> +2.39.2
> +
> 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 f956224e1820..07027225c58b 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
>             file://fancontrol.init \
>             file://sensord.init \
>             file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
> +           file://0001-Fix-building-with-GCC-14.patch \
>  "
>  SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
>
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110512): https://lists.openembedded.org/g/openembedded-devel/message/110512
> Mute This Topic: https://lists.openembedded.org/mt/106279990/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj May 25, 2024, 3:28 a.m. UTC | #2 
On Fri, May 24, 2024 at 7:10 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Fri, May 24, 2024 at 4:58 AM Dmitry Baryshkov via
> lists.openembedded.org <dbaryshkov=gmail.com@lists.openembedded.org>
> wrote:
> >
> > GCC 14 is more strict regarding const pointers conversion. Fix
> > conversion to let lmsensors build with GCC 14.

Well it now fails with GCC14 itself so I wonder

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3879/steps/14/logs/stdio

> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > ---
> >  .../0001-Fix-building-with-GCC-14.patch       | 36 +++++++++++++++++++
> >  .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb |  1 +
> >  2 files changed, 37 insertions(+)
> >  create mode 100644 meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
> >
> > 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 000000000000..73938e257708
> > --- /dev/null
> > +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
> > @@ -0,0 +1,36 @@
> > +From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
> > +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > +Date: Fri, 24 May 2024 14:16:21 +0300
> > +Subject: [PATCH] Fix building with GCC 14
> > +
> > +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > +Upstream-Status: Pending
>
> This is a good patch to submit upstream as well please open a PR at
> https://github.com/lm-sensors/lm-sensors/pulls
>
> > +---
> > + prog/sensord/rrd.c | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
> > +index a531362bddd5..36d685fce514 100644
> > +--- a/prog/sensord/rrd.c
> > ++++ b/prog/sensord/rrd.c
> > +@@ -299,7 +299,7 @@ int rrdInit(void)
> > +               argv[argc++] = rraBuff;
> > +               argv[argc] = NULL;
> > +
> > +-              ret = rrd_create(argc, (char**) argv);
> > ++              ret = rrd_create(argc, (const char**) argv);
> > +               if (ret == -1) {
> > +                       sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
> > +                                 sensord_args.rrdFile, rrd_get_error());
> > +@@ -455,7 +455,7 @@ int rrdUpdate(void)
> > +               const char *argv[] = {
> > +                       "sensord", sensord_args.rrdFile, rrdBuff, NULL
> > +               };
> > +-              if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
> > ++              if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
> > +                       sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
> > +                                 sensord_args.rrdFile, rrd_get_error());
> > +               }
> > +--
> > +2.39.2
> > +
> > 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 f956224e1820..07027225c58b 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
> >             file://fancontrol.init \
> >             file://sensord.init \
> >             file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
> > +           file://0001-Fix-building-with-GCC-14.patch \
> >  "
> >  SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
> >
> > --
> > 2.39.2
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#110512): https://lists.openembedded.org/g/openembedded-devel/message/110512
> > Mute This Topic: https://lists.openembedded.org/mt/106279990/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
diff mbox series

Patch

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 000000000000..73938e257708
--- /dev/null
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
@@ -0,0 +1,36 @@ 
+From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Fri, 24 May 2024 14:16:21 +0300
+Subject: [PATCH] Fix building with GCC 14
+
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Upstream-Status: Pending
+---
+ prog/sensord/rrd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
+index a531362bddd5..36d685fce514 100644
+--- a/prog/sensord/rrd.c
++++ b/prog/sensord/rrd.c
+@@ -299,7 +299,7 @@ int rrdInit(void)
+ 		argv[argc++] = rraBuff;
+ 		argv[argc] = NULL;
+ 
+-		ret = rrd_create(argc, (char**) argv);
++		ret = rrd_create(argc, (const char**) argv);
+ 		if (ret == -1) {
+ 			sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
+ 				  sensord_args.rrdFile, rrd_get_error());
+@@ -455,7 +455,7 @@ int rrdUpdate(void)
+ 		const char *argv[] = {
+ 			"sensord", sensord_args.rrdFile, rrdBuff, NULL
+ 		};
+-		if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
++		if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
+ 			sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
+ 				  sensord_args.rrdFile, rrd_get_error());
+ 		}
+-- 
+2.39.2
+
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 f956224e1820..07027225c58b 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
            file://fancontrol.init \
            file://sensord.init \
            file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
+           file://0001-Fix-building-with-GCC-14.patch \
 "
 SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"