All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3 1/1] gloox: new package
@ 2020-05-19  8:26 Yair Ben-Avraham
  2020-05-28 20:33 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Yair Ben-Avraham @ 2020-05-19  8:26 UTC (permalink / raw)
  To: buildroot

gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
clean ANSI C++. It makes writing spec-compliant clients easy and allows for
hassle-free integration of Jabber/XMPP functionality into existing
applications. gloox is released under the GNU GPLv3. Commercial licensing and
support are available.

Signed-off-by: Yair Ben Avraham <yairba@protonmail.com>
---
 package/Config.in        |  1 +
 package/gloox/Config.in  | 16 ++++++++++++++
 package/gloox/gloox.hash |  3 +++
 package/gloox/gloox.mk   | 47 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 package/gloox/Config.in
 create mode 100644 package/gloox/gloox.hash
 create mode 100644 package/gloox/gloox.mk

diff --git a/package/Config.in b/package/Config.in
index c245abbc42..637e6cbb6a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2039,6 +2039,7 @@ menu "Networking applications"
 	source "package/freeswitch-mod-bcg729/Config.in"
 	source "package/gerbera/Config.in"
 	source "package/gesftpserver/Config.in"
+	source "package/gloox/Config.in"
 	source "package/glorytun/Config.in"
 	source "package/gupnp-tools/Config.in"
 	source "package/gutenprint/Config.in"
diff --git a/package/gloox/Config.in b/package/gloox/Config.in
new file mode 100644
index 0000000000..91e9f06e34
--- /dev/null
+++ b/package/gloox/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_GLOOX
+	bool "gloox"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_MPC
+	help
+	  gloox is a portable high-level Jabber/XMPP library for C++. It
+	  is fully compliant with the XMPP RFCs, supports all of the
+	  XMPP features (including SRV lookups, TLS, SASL, roster
+	  management, and privacy lists), and implements several XEPs
+	  that make it ideal for writing any kind of Jabber/XMPP client
+	  or component.
+
+	  https://camaya.net/gloox/
+
+comment "gloox needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gloox/gloox.hash b/package/gloox/gloox.hash
new file mode 100644
index 0000000000..ee42c079b2
--- /dev/null
+++ b/package/gloox/gloox.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  97cb6a0c07e320ffa4a7c66e8ab06b2361086271dc87ed2398befef4e8435f8a  gloox-1.0.23.tar.bz2
+sha256  40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af  LICENSE
diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk
new file mode 100644
index 0000000000..a7df492566
--- /dev/null
+++ b/package/gloox/gloox.mk
@@ -0,0 +1,47 @@
+################################################################################
+#
+# gloox
+#
+################################################################################
+
+GLOOX_VERSION = 1.0.23
+GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2
+GLOOX_SITE = https://camaya.net/download
+GLOOX_LICENSE = GPL-3.0 with OpenSSL exception
+GLOOX_LICENSE_FILES = LICENSE
+GLOOX_INSTALL_STAGING = YES
+
+GLOOX_DEPENDENCIES += mpc
+
+GLOOX_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GLOOX_CXXFLAGS += -O0
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GLOOX_CONF_ENV += LIBS=-latomic
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GLOOX_CONF_OPTS += --with-zlib
+GLOOX_DEPENDENCIES += zlib
+else
+GLOOX_CONF_OPTS += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+GLOOX_CONF_OPTS += --with-openssl --without-gnutls
+GLOOX_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+GLOOX_CONF_OPTS += --with-gnutls --without-openssl
+GLOOX_DEPENDENCIES += gnutls
+else
+GLOOX_CONF_OPTS += --without-gnutls --without-openssl
+endif
+
+GLOOX_CONF_OPTS += \
+	--without-libidn \
+	--enable-getaddrinfo
+
+$(eval $(autotools-package))
--
2.20.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [Buildroot] [PATCH v3 1/1] gloox: new package
  2020-05-19  8:26 [Buildroot] [PATCH v3 1/1] gloox: new package Yair Ben-Avraham
@ 2020-05-28 20:33 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2020-05-28 20:33 UTC (permalink / raw)
  To: buildroot

Hello Yair,

On Tue, 19 May 2020 08:26:30 +0000
Yair Ben-Avraham <yairba@protonmail.com> wrote:

> gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
> clean ANSI C++. It makes writing spec-compliant clients easy and allows for
> hassle-free integration of Jabber/XMPP functionality into existing
> applications. gloox is released under the GNU GPLv3. Commercial licensing and
> support are available.
> 
> Signed-off-by: Yair Ben Avraham <yairba@protonmail.com>

I've applied your patch to our next branch, but after fixing a few
things. See below.

> ---
>  package/Config.in        |  1 +
>  package/gloox/Config.in  | 16 ++++++++++++++
>  package/gloox/gloox.hash |  3 +++
>  package/gloox/gloox.mk   | 47 ++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 67 insertions(+)

Your forgot to add an entry to the DEVELOPERS file, so I've done so.


> diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk
> new file mode 100644
> index 0000000000..a7df492566
> --- /dev/null
> +++ b/package/gloox/gloox.mk
> @@ -0,0 +1,47 @@
> +################################################################################
> +#
> +# gloox
> +#
> +################################################################################
> +
> +GLOOX_VERSION = 1.0.23
> +GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2
> +GLOOX_SITE = https://camaya.net/download
> +GLOOX_LICENSE = GPL-3.0 with OpenSSL exception
> +GLOOX_LICENSE_FILES = LICENSE
> +GLOOX_INSTALL_STAGING = YES
> +
> +GLOOX_DEPENDENCIES += mpc

No need for += here, = is fine as it's an unconditional dependency.

> +GLOOX_CXXFLAGS = $(TARGET_CXXFLAGS)
> +
> +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
> +GLOOX_CXXFLAGS += -O0
> +endif

This GLOOX_CXXFLAGS variable was not used anywhere. In a previous
iteration, you correctly had:

GLOOX_CONF_ENV += CXXFLAGS="$(GLOOX_CFLAGS)"

So I've re-added that.

> +
> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> +GLOOX_CONF_ENV += LIBS=-latomic
> +endif
> +
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +GLOOX_CONF_OPTS += --with-zlib
> +GLOOX_DEPENDENCIES += zlib
> +else
> +GLOOX_CONF_OPTS += --without-zlib
> +endif
> +
> +ifeq ($(BR2_PACKAGE_OPENSSL),y)
> +GLOOX_CONF_OPTS += --with-openssl --without-gnutls
> +GLOOX_DEPENDENCIES += openssl
> +else ifeq ($(BR2_PACKAGE_GNUTLS),y)
> +GLOOX_CONF_OPTS += --with-gnutls --without-openssl
> +GLOOX_DEPENDENCIES += gnutls
> +else
> +GLOOX_CONF_OPTS += --without-gnutls --without-openssl
> +endif
> +
> +GLOOX_CONF_OPTS += \
> +	--without-libidn \
> +	--enable-getaddrinfo

No need for += here as well, and I've moved this up, together with the
unconditional definitions earlier in the file.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-28 20:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19  8:26 [Buildroot] [PATCH v3 1/1] gloox: new package Yair Ben-Avraham
2020-05-28 20:33 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.