paho-mqtt-c: upgrade 1.3.1 -> 1.3.2

add patches for resoving compile error with musl:
0001-Fix-bug-of-free-with-musl.patch

Eclipse Public License : update to v 2.0
-License-Update: updated to 2020.

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2020-04-26 11:27:25 -07:00 committed by Khem Raj
parent 1f35a5af9b
commit b0345e3fe4
2 changed files with 49 additions and 5 deletions

View File

@ -0,0 +1,39 @@
From 96233a8382b9520293a48b08dc3b204a21205800 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Fri, 24 Apr 2020 00:53:19 +0900
Subject: [PATCH] Fix bug of free() with musl
This fixes build error with musl C library:
/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:24:
error: expected declaration specifiers or '...' before string constant
55 | #define free(x) myfree(__FILE__, __LINE__, x)
| ^~~~~~~~
/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:34:
error: expected declaration specifiers or '...' before numeric constant
55 | #define free(x) myfree(__FILE__, __LINE__, x)
| ^~~~~~~~
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
src/MQTTReasonCodes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/MQTTReasonCodes.c b/src/MQTTReasonCodes.c
index 416eab5..479dbac 100644
--- a/src/MQTTReasonCodes.c
+++ b/src/MQTTReasonCodes.c
@@ -16,10 +16,10 @@
#include "MQTTReasonCodes.h"
-#include "Heap.h"
#include "StackTrace.h"
#include <memory.h>
+#include "Heap.h"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
--
2.17.1

View File

@ -6,14 +6,15 @@ LICENSE = "EPL-1.0 | EDL-1.0"
LIC_FILES_CHKSUM = " \
file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \
file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \
file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \
file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
file://notice.html;md5=943f861069889acecebf51dfa24478e2 \
file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \
"
SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http"
SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http \
file://0001-Fix-bug-of-free-with-musl.patch"
SRCREV = "d34c51214f4172f2e12bb17532c9f44f72a57dd4"
SRCREV = "fbe39064c4416f879308a8a5390b19d544970789"
DEPENDS = "openssl"
@ -28,3 +29,7 @@ do_install_append() {
}
EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON"
do_configure_prepend_libc-musl() {
sed -i -e "s/SET(LIBS_SYSTEM c dl pthread anl rt)/SET(LIBS_SYSTEM c dl pthread rt)/g" ${S}/src/CMakeLists.txt
}