Skip to contentSkip to conversation

package/paho-mqtt-c: bump to version 1.3.4

PATCH New Titouan Christophe 3 participants 3 messages Jun 15, 2020 – Jul 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/paho-mqtt-c: bump to version 1.3.4

This is a crucial bugfix release that fixes a backward incompatible ABI change introduced in 1.3.2.

Also drop patches that are now applied upstream.

---
 ...ists.txt-fix-build-on-uclibc-or-musl.patch | 45 ------------------
 ...X-language-to-support-using-Generate.patch | 46 -------------------
 package/paho-mqtt-c/paho-mqtt-c.hash          |  2 +-
 package/paho-mqtt-c/paho-mqtt-c.mk            |  2 +-
 4 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch
 delete mode 100644 package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch
package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch deleted +0 -45
deleted file mode 100644
index 7989f045b9..0000000000
@@ -1,45 +0,0 @@
-From 517e8659ab566b15cc409490a432e8935b164de8 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 24 Apr 2020 11:55:41 +0200
-Subject: [PATCH] src/CMakeLists.txt: fix build on uclibc or musl
-
-Build of version 1.3.2 with uclibc or musl fails on:
-
-[ 58%] Linking C shared library libpaho-mqtt3c.so
-/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lanl
-collect2: error: ld returned 1 exit status
-
-This is due to commit 21ffebcb749fc8bd8578df85550f03f74e571620 which
-added a link to anl which is not available on uclibc or musl.
-
-Fix this by checking if anl is found on the system before using it
-
-Fixes:
- - http://autobuild.buildroot.org/results/4beb96d43180813906578b42875a1c3d4a905ed7
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from:
-https://github.com/eclipse/paho.mqtt.c/commit/517e8659ab566b15cc409490a432e8935b164de8]
----
- src/CMakeLists.txt | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fb367b37..95fd43e7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -60,7 +60,13 @@ IF (WIN32)
-     SET(LIBS_SYSTEM ws2_32 crypt32 RpcRT4)
- ELSEIF (UNIX)
-     IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
--        SET(LIBS_SYSTEM c dl pthread anl rt)
-+        SET(LIBS_SYSTEM c dl pthread rt)
-+        # anl is only available with glibc so check if it is found before using
-+        # it or build will fail on uclibc or musl
-+        FIND_LIBRARY(LIB_ANL anl)
-+        IF(LIB_ANL)
-+            SET(LIBS_SYSTEM "${LIBS_SYSTEM} ${LIB_ANL}")
-+        ENDIF()
-         ADD_DEFINITIONS(-D_GNU_SOURCE -fvisibility=hidden)
-     ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Android")
-         SET(LIBS_SYSTEM c dl)
package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch deleted +0 -46

46 lines not on this page · raw message

package/paho-mqtt-c/paho-mqtt-c.hash +1 -1
index 8f6ca61480..bbfa2da386 100644
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  c426334c2ffc9f7a230e3de5162bdbc1762f8f60ffe27460e553edb74c7e0681  paho-mqtt-c-1.3.2.tar.gz
+sha256  1ae9b657b693254ed0710350df3dcf5232d1f479409a52861b5e5bb5cc3da046  paho-mqtt-c-1.3.4.tar.gz
 sha256  83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c  edl-v10
 sha256  0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303  epl-v20
 sha256  99d3a5c5cc2812f0593a85ec7c1b6dd83e8477b5090c01d9de0d49d49f367a4a  LICENSE
package/paho-mqtt-c/paho-mqtt-c.mk +1 -1
index c7ecf412cd..aa2a0b026e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PAHO_MQTT_C_VERSION = 1.3.2
+PAHO_MQTT_C_VERSION = 1.3.4
 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION))
 PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE
Signature · 1 line
2.25.3
#1 lore raw

PATCH 1/1 package/paho-mqtt-c: bump to version 1.3.4

Quoted 6 lines · On Mon, 15 Jun 2020 18:09:52 +0200 Titouan Christophe…

This is a crucial bugfix release that fixes a backward incompatible ABI change introduced in 1.3.2.

Also drop patches that are now applied upstream.

Quoted 8 lines
---
 ...ists.txt-fix-build-on-uclibc-or-musl.patch | 45 ------------------
 ...X-language-to-support-using-Generate.patch | 46 -------------------
 package/paho-mqtt-c/paho-mqtt-c.hash          |  2 +-
 package/paho-mqtt-c/paho-mqtt-c.mk            |  2 +-
 4 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch
 delete mode 100644 package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/paho-mqtt-c: bump to version 1.3.4

In reply to Titouan Christophe
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Titouan" == Titouan Christophe <[email protected]> writes:

This is a crucial bugfix release that fixes a backward incompatible ABI change introduced in 1.3.2.

Also drop patches that are now applied upstream.

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard