From 318627819b61ec8f433d47be6ca45db07a6fb930 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sat, 25 Jan 2020 19:52:17 +0100 Subject: mosquitto: apply upstream proposed patches to use cmake build system, simplifying a lot the build and install process. Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../mosquitto/files/1568.patch | 67 ++++++++++++++++++++++ .../mosquitto/files/1569.patch | 25 ++++++++ .../mosquitto/files/1570.patch | 39 +++++++++++++ .../mosquitto/files/1571.patch | 24 ++++++++ 4 files changed, 155 insertions(+) create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1568.patch create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1569.patch create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1570.patch create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1571.patch (limited to 'meta-networking/recipes-connectivity/mosquitto/files') diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch b/meta-networking/recipes-connectivity/mosquitto/files/1568.patch new file mode 100644 index 0000000000..15f7a91057 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/1568.patch @@ -0,0 +1,67 @@ +Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1568] +From 50bfc79cae5764a6e513b684a5eb5bef2b35c856 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 22 Jan 2020 12:30:25 +0100 +Subject: [PATCH] Bugfix: include "deps" directory only if BUNDLED_DEPS has + been provided and set to true + +Signed-off-by: Gianfranco Costamagna +--- + config.mk | 5 ++++- + lib/CMakeLists.txt | 5 ++++- + test/unit/Makefile | 6 +++++- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/config.mk b/config.mk +index 51e36e0d0..0ac24b3d4 100644 +--- a/config.mk ++++ b/config.mk +@@ -135,7 +135,10 @@ endif + + STATIC_LIB_DEPS:= + +-LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps ++LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib ++ifeq ($(WITH_BUNDLED_DEPS),yes) ++ LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps ++endif + LIB_CFLAGS:=$(CFLAGS) + LIB_CXXFLAGS:=$(CXXFLAGS) + LIB_LDFLAGS:=$(LDFLAGS) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index e1521f12a..891046a81 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -1,11 +1,14 @@ + add_subdirectory(cpp) + + include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib +- ${mosquitto_SOURCE_DIR}/src/deps + ${STDBOOL_H_PATH} ${STDINT_H_PATH} + ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}) + link_directories(${mosquitto_SOURCE_DIR}/lib) + ++if (WITH_BUNDLED_DEPS) ++ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps) ++endif (WITH_BUNDLED_DEPS) ++ + set(C_SRC + actions.c + callbacks.c +diff --git a/test/unit/Makefile b/test/unit/Makefile +index 9d422428d..928579492 100644 +--- a/test/unit/Makefile ++++ b/test/unit/Makefile +@@ -2,7 +2,11 @@ include ../../config.mk + + .PHONY: all check test test-broker test-lib clean coverage + +-CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps ++CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src ++ifeq ($(WITH_BUNDLED_DEPS),yes) ++ CPPFLAGS:=$(CPPFLAGS) -I../../src/deps ++endif ++ + CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb + LDFLAGS:=$(LDFLAGS) -coverage + LDADD:=$(LDADD) -lcunit diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1569.patch b/meta-networking/recipes-connectivity/mosquitto/files/1569.patch new file mode 100644 index 0000000000..9718b98c82 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/1569.patch @@ -0,0 +1,25 @@ +Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1569] +From fda932612afce2cead2fd2ca1c8ea543b2892177 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 22 Jan 2020 12:31:01 +0100 +Subject: [PATCH] Bugfix: enabling DLT was overriding everything else on linker + flags because of error in cmake set keyword + +Signed-off-by: Gianfranco Costamagna +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7898ff5b1..6dfbba5e6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -130,7 +130,7 @@ add_definitions (-DWITH_BROKER) + if (WITH_DLT) + message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}") + link_directories(${DLT_LIBDIR}) +- set (MOSQ_LIBS ${DLT_LIBRARIES}) ++ set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES}) + endif (WITH_DLT) + + set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1570.patch b/meta-networking/recipes-connectivity/mosquitto/files/1570.patch new file mode 100644 index 0000000000..f11fc48150 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/1570.patch @@ -0,0 +1,39 @@ +Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1570] +From 775677b05190380c3736bf0dbef002ee7b9bff33 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 22 Jan 2020 12:29:41 +0100 +Subject: [PATCH] cmake: add ADNS enable/disable dynamic support + +Signed-off-by: Gianfranco Costamagna +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7898ff5b1..edae76f32 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -105,6 +105,9 @@ if (WITH_SYS_TREE) + add_definitions("-DWITH_SYS_TREE") + endif (WITH_SYS_TREE) + ++option(WITH_ADNS ++ "Include ADNS support?" OFF) ++ + if (CMAKE_SYSTEM_NAME STREQUAL Linux) + option(WITH_SYSTEMD + "Include systemd support?" OFF) +@@ -137,10 +140,11 @@ set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) + # Check for getaddrinfo_a + include(CheckLibraryExists) + check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A) +-if (HAVE_GETADDRINFO_A) ++if (HAVE_GETADDRINFO_A AND WITH_ADNS) ++ add_definitions("-DWITH_ADNS") + add_definitions(-DHAVE_GETADDRINFO_A) + set (MOSQ_LIBS ${MOSQ_LIBS} anl) +-endif (HAVE_GETADDRINFO_A) ++endif (HAVE_GETADDRINFO_A AND WITH_ADNS) + + + if (UNIX) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch new file mode 100644 index 0000000000..2cfa48457a --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -0,0 +1,24 @@ +Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571] +From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 22 Jan 2020 12:39:49 +0100 +Subject: [PATCH] Add dynamic symbols linking with cmake too + +Signed-off-by: Gianfranco Costamagna +--- + lib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index e1521f12a..14ba12739 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES + OUTPUT_NAME mosquitto + VERSION ${VERSION} + SOVERSION 1 ++ LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version ++ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version" + ) + + install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -- cgit v1.2.3-54-g00ecf