diff options
| -rw-r--r-- | meta-networking/recipes-connectivity/mosquitto/files/1571.patch | 22 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/mosquitto/files/2894.patch | 25 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb (renamed from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb) | 4 |
3 files changed, 1 insertions, 50 deletions
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch deleted file mode 100644 index 627638ec89..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571] | ||
| 2 | From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001 | ||
| 3 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
| 4 | Date: Wed, 22 Jan 2020 12:39:49 +0100 | ||
| 5 | Subject: [PATCH] Add dynamic symbols linking with cmake too | ||
| 6 | |||
| 7 | Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
| 8 | --- | ||
| 9 | lib/CMakeLists.txt | 2 ++ | ||
| 10 | 1 file changed, 2 insertions(+) | ||
| 11 | |||
| 12 | --- a/lib/CMakeLists.txt | ||
| 13 | +++ b/lib/CMakeLists.txt | ||
| 14 | @@ -94,6 +94,8 @@ | ||
| 15 | OUTPUT_NAME mosquitto | ||
| 16 | VERSION ${VERSION} | ||
| 17 | SOVERSION 1 | ||
| 18 | + LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version | ||
| 19 | + LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version" | ||
| 20 | ) | ||
| 21 | |||
| 22 | install(TARGETS libmosquitto | ||
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch deleted file mode 100644 index 7374cbd26f..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From: Joachim Zobel <jz-2017@heute-morgen.de> | ||
| 2 | Date: Wed, 13 Sep 2023 09:55:34 +0200 | ||
| 3 | Subject: [PATCH] Link correctly with shared websockets library if needed see: | ||
| 4 | https://github.com/eclipse/mosquitto/pull/2751 | ||
| 5 | |||
| 6 | Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and Daniel Engberg <daniel.engberg.lists@pyret.net> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | src/CMakeLists.txt | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
| 14 | index 9380a04..dce8313 100644 | ||
| 15 | --- a/src/CMakeLists.txt | ||
| 16 | +++ b/src/CMakeLists.txt | ||
| 17 | @@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) | ||
| 18 | link_directories(${mosquitto_SOURCE_DIR}) | ||
| 19 | endif (WIN32) | ||
| 20 | else (STATIC_WEBSOCKETS) | ||
| 21 | - set (MOSQ_LIBS ${MOSQ_LIBS} websockets) | ||
| 22 | + set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) | ||
| 23 | endif (STATIC_WEBSOCKETS) | ||
| 24 | endif (WITH_WEBSOCKETS) | ||
| 25 | |||
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb index ea9eb4857b..c6ce2e095e 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb | |||
| @@ -16,12 +16,10 @@ DEPENDS = "uthash cjson" | |||
| 16 | 16 | ||
| 17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ | 17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ |
| 18 | file://mosquitto.init \ | 18 | file://mosquitto.init \ |
| 19 | file://1571.patch \ | ||
| 20 | file://2894.patch \ | ||
| 21 | file://2895.patch \ | 19 | file://2895.patch \ |
| 22 | " | 20 | " |
| 23 | 21 | ||
| 24 | SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a" | 22 | SRC_URI[sha256sum] = "33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9" |
| 25 | 23 | ||
| 26 | inherit systemd update-rc.d useradd cmake pkgconfig | 24 | inherit systemd update-rc.d useradd cmake pkgconfig |
| 27 | 25 | ||
