summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark.yang <mark.yang@lge.com>2025-04-07 19:47:43 +0900
committerKhem Raj <raj.khem@gmail.com>2025-04-07 12:21:22 -0700
commit7787e41e808db437062bb684dd2f93fdbc921d1a (patch)
tree7fbd54ced01af5b5f3a933b5d838a9e19874876a
parent8ef6332dcf5b4020dac4a566430878cbf72f0627 (diff)
downloadmeta-openembedded-7787e41e808db437062bb684dd2f93fdbc921d1a.tar.gz
digitemp: fix build failure with gcc-15.0.1
* backport fix from: https://github.com/bcl/digitemp/commit/fa56b0f78d12f97ac44e0a367d413a9e88611d1c to fix: src/digitemp.c:171:6: error: conflicting types for ‘free_coupler’; have ‘void(int)’ 171 | void free_coupler( int free_only ) | ^~~~~~~~~~~~ In file included from src/digitemp.c:78: src/digitemp.h:90:6: note: previous declaration of ‘free_coupler’ with type ‘void(void)’ 90 | void free_coupler(); | ^~~~~~~~~~~~ Signed-off-by: mark.yang <mark.yang@lge.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch32
-rw-r--r--meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb5
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
new file mode 100644
index 0000000000..484fc1c3a2
--- /dev/null
+++ b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
@@ -0,0 +1,32 @@
1From fa56b0f78d12f97ac44e0a367d413a9e88611d1c Mon Sep 17 00:00:00 2001
2From: Robert Scheck <robert-scheck@users.noreply.github.com>
3Date: Thu, 16 Jan 2025 21:24:41 +0100
4Subject: [PATCH] Fix conflicting prototype
5
6src/digitemp.c:171:6: error: conflicting types for ‘free_coupler’; have ‘void(int)’
7 171 | void free_coupler( int free_only )
8 | ^~~~~~~~~~~~
9In file included from src/digitemp.c:78:
10src/digitemp.h:90:6: note: previous declaration of ‘free_coupler’ with type ‘void(void)’
11 90 | void free_coupler();
12 | ^~~~~~~~~~~~
13
14Upstream-Status: Backport [https://github.com/bcl/digitemp/commit/fa56b0f78d12f97ac44e0a367d413a9e88611d1c]
15Signed-off-by: mark.yang <mark.yang@lge.com>
16---
17 src/digitemp.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/digitemp.h b/src/digitemp.h
21index 06d50e9..e81a7be 100644
22--- a/src/digitemp.h
23+++ b/src/digitemp.h
24@@ -87,7 +87,7 @@ struct _coupler {
25
26 /* Prototypes */
27 void usage();
28-void free_coupler();
29+void free_coupler( int free_only );
30 float c2f( float temp );
31 int build_tf( char *time_format, char *format, int sensor,
32 float temp_c, int humidity, unsigned char *sn );
diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
index 6565097334..5272b8ea06 100644
--- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
+++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
@@ -4,7 +4,10 @@ DEPENDS = "libusb1"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" 5LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
6 6
7SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" 7SRC_URI = " \
8 git://github.com/bcl/digitemp;branch=master;protocol=https \
9 file://0001-Fix-conflicting-prototype.patch \
10"
8 11
9SRCREV = "a162e63aad35358aab325388f3d5e88121606419" 12SRCREV = "a162e63aad35358aab325388f3d5e88121606419"
10 13