* [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap
@ 2020-12-23 10:59 Fabrice Fontaine
2020-12-23 10:59 ` [Buildroot] [PATCH 2/3] package/mutt: add zlib optional dependency Fabrice Fontaine
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2020-12-23 10:59 UTC (permalink / raw)
To: buildroot
Activation of openssl for imap is broken since commit
0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
BR2_PACKAGET_MUTT_IMAP
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mutt/mutt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 58c80d445d..cc4b5f56b4 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -43,7 +43,7 @@ MUTT_CONF_OPTS += --disable-pop
endif
# SSL support is only used by imap or pop3 module
-ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
+ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MUTT_DEPENDENCIES += openssl
MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/3] package/mutt: add zlib optional dependency
2020-12-23 10:59 [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Fabrice Fontaine
@ 2020-12-23 10:59 ` Fabrice Fontaine
2020-12-27 8:02 ` Peter Korsgaard
2020-12-23 10:59 ` [Buildroot] [PATCH 3/3] package/mutt: add gnutls " Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2020-12-23 10:59 UTC (permalink / raw)
To: buildroot
zlib is an optional dependency which is enabled by default since version
1.14.1 and
https://gitlab.com/muttmua/mutt/-/commit/136ae0add512f21bc418f9e31a2f1b970ad1a490
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mutt/mutt.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index cc4b5f56b4..4e14004577 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -61,6 +61,13 @@ else
MUTT_CONF_OPTS += --without-sqlite3
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+MUTT_DEPENDENCIES += zlib
+MUTT_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
+else
+MUTT_CONF_OPTS += --without-zlib
+endif
+
# Avoid running tests to check for:
# - target system is *BSD
# - C99 conformance (snprintf, vsnprintf)
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 3/3] package/mutt: add gnutls optional dependency
2020-12-23 10:59 [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Fabrice Fontaine
2020-12-23 10:59 ` [Buildroot] [PATCH 2/3] package/mutt: add zlib optional dependency Fabrice Fontaine
@ 2020-12-23 10:59 ` Fabrice Fontaine
2020-12-26 17:23 ` [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Thomas Petazzoni
2020-12-27 8:01 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2020-12-23 10:59 UTC (permalink / raw)
To: buildroot
gnutls is an optional dependency since version 1.5.7 and
https://gitlab.com/muttmua/mutt/-/commit/457d70d6b10860bae084837024eb34aa3bfbc5fa
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mutt/mutt.mk | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 4e14004577..67fc4ed838 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -46,12 +46,23 @@ endif
ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MUTT_DEPENDENCIES += openssl
-MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+MUTT_CONF_OPTS += \
+ --without-gnutls \
+ --with-ssl=$(STAGING_DIR)/usr
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+MUTT_DEPENDENCIES += gnutls
+MUTT_CONF_OPTS += \
+ --with-gnutls=$(STAGING_DIR)/usr \
+ --without-ssl
else
-MUTT_CONF_OPTS += --without-ssl
+MUTT_CONF_OPTS += \
+ --without-gnutls \
+ --without-ssl
endif
else
-MUTT_CONF_OPTS += --without-ssl
+MUTT_CONF_OPTS += \
+ --without-gnutls \
+ --without-ssl
endif
ifeq ($(BR2_PACKAGE_SQLITE),y)
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap
2020-12-23 10:59 [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Fabrice Fontaine
2020-12-23 10:59 ` [Buildroot] [PATCH 2/3] package/mutt: add zlib optional dependency Fabrice Fontaine
2020-12-23 10:59 ` [Buildroot] [PATCH 3/3] package/mutt: add gnutls " Fabrice Fontaine
@ 2020-12-26 17:23 ` Thomas Petazzoni
2020-12-27 8:01 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2020-12-26 17:23 UTC (permalink / raw)
To: buildroot
On Wed, 23 Dec 2020 11:59:48 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Activation of openssl for imap is broken since commit
> 0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
> BR2_PACKAGET_MUTT_IMAP
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/mutt/mutt.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Series applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap
2020-12-23 10:59 [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Fabrice Fontaine
` (2 preceding siblings ...)
2020-12-26 17:23 ` [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Thomas Petazzoni
@ 2020-12-27 8:01 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-12-27 8:01 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Activation of openssl for imap is broken since commit
> 0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
> BR2_PACKAGET_MUTT_IMAP
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-27 8:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-23 10:59 [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Fabrice Fontaine
2020-12-23 10:59 ` [Buildroot] [PATCH 2/3] package/mutt: add zlib optional dependency Fabrice Fontaine
2020-12-27 8:02 ` Peter Korsgaard
2020-12-23 10:59 ` [Buildroot] [PATCH 3/3] package/mutt: add gnutls " Fabrice Fontaine
2020-12-26 17:23 ` [Buildroot] [PATCH 1/3] package/mutt: fix activation of openssl on imap Thomas Petazzoni
2020-12-27 8:01 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox