diff options
| -rw-r--r-- | meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.15.bb (renamed from meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb) | 5 |
2 files changed, 2 insertions, 40 deletions
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch deleted file mode 100644 index 4215f698c7..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 02fa96d0d59211e64483273e5253ca45c4395154 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "mark.yang" <mark.yang@lge.com> | ||
| 3 | Date: Wed, 9 Apr 2025 19:05:55 +0900 | ||
| 4 | Subject: [PATCH] Fix build error due to bool keyword with gcc-15 | ||
| 5 | |||
| 6 | * gcc-15 uses gnu23 for c. | ||
| 7 | 'bool' is a keyword. | ||
| 8 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: error: 'bool' cannot be defined via 'typedef' | ||
| 9 | 31 | typedef unsigned int bool; | ||
| 10 | | ^~~~ | ||
| 11 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: note: 'bool' is a keyword with '-std=c23' onwards | ||
| 12 | TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:1: warning: useless type name in empty declaration | ||
| 13 | 31 | typedef unsigned int bool; | ||
| 14 | | ^~~~~~~ | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/eclipse-paho/paho.mqtt.c/pull/1595] | ||
| 17 | Signed-off-by: mark.yang <mark.yang@lge.com> | ||
| 18 | Signed-off-by: markyang92 <pllpokko@alumni.kaist.ac.kr> | ||
| 19 | |||
| 20 | --- | ||
| 21 | src/MQTTPacket.h | 2 ++ | ||
| 22 | 1 file changed, 2 insertions(+) | ||
| 23 | |||
| 24 | diff --git a/src/MQTTPacket.h b/src/MQTTPacket.h | ||
| 25 | index fd384ae9..0c64a0f4 100644 | ||
| 26 | --- a/src/MQTTPacket.h | ||
| 27 | +++ b/src/MQTTPacket.h | ||
| 28 | @@ -28,7 +28,9 @@ | ||
| 29 | #include "LinkedList.h" | ||
| 30 | #include "Clients.h" | ||
| 31 | |||
| 32 | +#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L | ||
| 33 | typedef unsigned int bool; | ||
| 34 | +#endif | ||
| 35 | typedef void* (*pf)(int, unsigned char, char*, size_t); | ||
| 36 | |||
| 37 | #include "MQTTProperties.h" | ||
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.15.bb index ad6637ed88..64b9de3848 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.15.bb | |||
| @@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
| 14 | git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master \ | 14 | git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master;tag=v${PV} \ |
| 15 | file://0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch \ | ||
| 16 | " | 15 | " |
| 17 | 16 | ||
| 18 | SRCREV = "2150ba29d9df24ad1733c460eb099f292af84ee5" | 17 | SRCREV = "62782406bcf511ee8e22bc34e826f8c6b8254c7c" |
| 19 | 18 | ||
| 20 | DEPENDS = "openssl" | 19 | DEPENDS = "openssl" |
| 21 | 20 | ||
