diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch new file mode 100644 index 000000000..12f9e7abc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch @@ -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 + |