summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/mosquitto/files/1568.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/mosquitto/files/1568.patch')
-rw-r--r--meta-networking/recipes-connectivity/mosquitto/files/1568.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch b/meta-networking/recipes-connectivity/mosquitto/files/1568.patch
deleted file mode 100644
index 15f7a91057..0000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1568]
2From 50bfc79cae5764a6e513b684a5eb5bef2b35c856 Mon Sep 17 00:00:00 2001
3From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
4Date: Wed, 22 Jan 2020 12:30:25 +0100
5Subject: [PATCH] Bugfix: include "deps" directory only if BUNDLED_DEPS has
6 been provided and set to true
7
8Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
9---
10 config.mk | 5 ++++-
11 lib/CMakeLists.txt | 5 ++++-
12 test/unit/Makefile | 6 +++++-
13 3 files changed, 13 insertions(+), 3 deletions(-)
14
15diff --git a/config.mk b/config.mk
16index 51e36e0d0..0ac24b3d4 100644
17--- a/config.mk
18+++ b/config.mk
19@@ -135,7 +135,10 @@ endif
20
21 STATIC_LIB_DEPS:=
22
23-LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps
24+LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib
25+ifeq ($(WITH_BUNDLED_DEPS),yes)
26+ LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps
27+endif
28 LIB_CFLAGS:=$(CFLAGS)
29 LIB_CXXFLAGS:=$(CXXFLAGS)
30 LIB_LDFLAGS:=$(LDFLAGS)
31diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
32index e1521f12a..891046a81 100644
33--- a/lib/CMakeLists.txt
34+++ b/lib/CMakeLists.txt
35@@ -1,11 +1,14 @@
36 add_subdirectory(cpp)
37
38 include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
39- ${mosquitto_SOURCE_DIR}/src/deps
40 ${STDBOOL_H_PATH} ${STDINT_H_PATH}
41 ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR})
42 link_directories(${mosquitto_SOURCE_DIR}/lib)
43
44+if (WITH_BUNDLED_DEPS)
45+ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps)
46+endif (WITH_BUNDLED_DEPS)
47+
48 set(C_SRC
49 actions.c
50 callbacks.c
51diff --git a/test/unit/Makefile b/test/unit/Makefile
52index 9d422428d..928579492 100644
53--- a/test/unit/Makefile
54+++ b/test/unit/Makefile
55@@ -2,7 +2,11 @@ include ../../config.mk
56
57 .PHONY: all check test test-broker test-lib clean coverage
58
59-CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps
60+CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src
61+ifeq ($(WITH_BUNDLED_DEPS),yes)
62+ CPPFLAGS:=$(CPPFLAGS) -I../../src/deps
63+endif
64+
65 CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb
66 LDFLAGS:=$(LDFLAGS) -coverage
67 LDADD:=$(LDADD) -lcunit