Skip to contentSkip to conversation

package/mosquitto: drop patch

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 4, 2020 – Jan 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mosquitto: drop patch

Drop patch (refused by upstream) and use CLIENT_STATIC_LDADD that has been added in version 1.6.8 with
https://github.com/eclipse/mosquitto/commit/6bde2097992f7d672e4c2c36168bfb5c73579bc3

---
 ...nfig.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch | 41 -------------------
 package/mosquitto/mosquitto.mk                |  2 +-
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch
package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch deleted +0 -41
deleted file mode 100644
index fcc169aaca..0000000000
@@ -1,41 +0,0 @@
-From 9a1ea149d3451d4edf32c5f0f0d1b4fecfbff4a2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Tue, 6 Aug 2019 22:11:57 +0200
-Subject: [PATCH] config.mk: add WITH_TLS_STATIC_LIB_DEPS
-
-Add WITH_TLS_STATIC_LIB_DEPS to allow the user to give openssl static
-libraries dependencies such as -lz or -latomic
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/eclipse/mosquitto/pull/1371]
----
- config.mk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/config.mk b/config.mk
-index 6c23bef..c9e2daf 100644
---- a/config.mk
-+++ b/config.mk
-@@ -23,6 +23,10 @@
- # password authentication at all.
- WITH_TLS:=yes
- 
-+# Use this variable to give openssl static libraries dependencies (such as -lz
-+# or -latomic) that can be retrieved for example by pkg-config
-+WITH_TLS_STATIC_LIB_DEPS:=
-+
- # Comment out to disable TLS/PSK support in the broker and client. Requires
- # WITH_TLS=yes.
- # This must be disabled if using openssl < 1.0.
-@@ -202,7 +206,7 @@ ifeq ($(WITH_TLS),yes)
- 	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_TLS
- 	PASSWD_LDADD:=$(PASSWD_LDADD) -lcrypto
- 	CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_TLS
--	STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto
-+	STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto $(WITH_TLS_STATIC_LIB_DEPS)
- 
- 	ifeq ($(WITH_TLS_PSK),yes)
- 		BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_TLS_PSK
--- 
-2.20.1
-
package/mosquitto/mosquitto.mk +1 -1
index 2c3bd18d5e..aab193c14d 100644
@@ -51,7 +51,7 @@ ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl
 MOSQUITTO_MAKE_OPTS += \
 	WITH_TLS=yes \
-	WITH_TLS_STATIC_LIB_DEPS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
+	CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
 else
 MOSQUITTO_MAKE_OPTS += WITH_TLS=no
 endif
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/mosquitto: drop patch

Fabrice, All,

On 2020-01-04 23:06 +0100, Fabrice Fontaine spake thusly:

Quoted 5 lines

Drop patch (refused by upstream) and use CLIENT_STATIC_LDADD that has been added in version 1.6.8 with
https://github.com/eclipse/mosquitto/commit/6bde2097992f7d672e4c2c36168bfb5c73579bc3

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 73 lines
---
 ...nfig.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch | 41 -------------------
 package/mosquitto/mosquitto.mk                |  2 +-
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch
package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch deleted +0 -41
deleted file mode 100644
index fcc169aaca..0000000000
@@ -1,41 +0,0 @@
-From 9a1ea149d3451d4edf32c5f0f0d1b4fecfbff4a2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Tue, 6 Aug 2019 22:11:57 +0200
-Subject: [PATCH] config.mk: add WITH_TLS_STATIC_LIB_DEPS
-
-Add WITH_TLS_STATIC_LIB_DEPS to allow the user to give openssl static
-libraries dependencies such as -lz or -latomic
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/eclipse/mosquitto/pull/1371]
----
- config.mk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/config.mk b/config.mk
-index 6c23bef..c9e2daf 100644
---- a/config.mk
-+++ b/config.mk
-@@ -23,6 +23,10 @@
- # password authentication at all.
- WITH_TLS:=yes
- 
-+# Use this variable to give openssl static libraries dependencies (such as -lz
-+# or -latomic) that can be retrieved for example by pkg-config
-+WITH_TLS_STATIC_LIB_DEPS:=
-+
- # Comment out to disable TLS/PSK support in the broker and client. Requires
- # WITH_TLS=yes.
- # This must be disabled if using openssl < 1.0.
-@@ -202,7 +206,7 @@ ifeq ($(WITH_TLS),yes)
- 	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_TLS
- 	PASSWD_LDADD:=$(PASSWD_LDADD) -lcrypto
- 	CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_TLS
--	STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto
-+	STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto $(WITH_TLS_STATIC_LIB_DEPS)
- 
- 	ifeq ($(WITH_TLS_PSK),yes)
- 		BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_TLS_PSK
--- 
-2.20.1
-
package/mosquitto/mosquitto.mk +1 -1
index 2c3bd18d5e..aab193c14d 100644
@@ -51,7 +51,7 @@ ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl
 MOSQUITTO_MAKE_OPTS += \
 	WITH_TLS=yes \
-	WITH_TLS_STATIC_LIB_DEPS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
+	CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
 else
 MOSQUITTO_MAKE_OPTS += WITH_TLS=no
 endif
Signature · 6 lines
2.24.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'