All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Oudinet <johan.oudinet@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 15/16] erlang-p1-xmpp: New package
Date: Tue, 30 May 2017 16:52:10 +0200	[thread overview]
Message-ID: <20170530145211.15320-16-johan.oudinet@gmail.com> (raw)
In-Reply-To: <20170530145211.15320-1-johan.oudinet@gmail.com>

XMPP library for Erlang.
https://github.com/processone/xmpp

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/Config.in                                      |  1 +
 package/erlang-p1-xmpp/0001-fix-includes.patch         | 16 ++++++++++++++++
 .../0002-remove-dependencies-from-rebar-config.patch   | 18 ++++++++++++++++++
 package/erlang-p1-xmpp/Config.in                       |  8 ++++++++
 package/erlang-p1-xmpp/erlang-p1-xmpp.hash             |  2 ++
 package/erlang-p1-xmpp/erlang-p1-xmpp.mk               | 16 ++++++++++++++++
 6 files changed, 61 insertions(+)
 create mode 100644 package/erlang-p1-xmpp/0001-fix-includes.patch
 create mode 100644 package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
 create mode 100644 package/erlang-p1-xmpp/Config.in
 create mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.hash
 create mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.mk

diff --git a/package/Config.in b/package/Config.in
index 580974a02d..59980af2de 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -521,6 +521,7 @@ menu "Erlang libraries/modules"
 	source "package/erlang-p1-tls/Config.in"
 	source "package/erlang-p1-utils/Config.in"
 	source "package/erlang-p1-xml/Config.in"
+	source "package/erlang-p1-xmpp/Config.in"
 	source "package/erlang-p1-yaml/Config.in"
 	source "package/erlang-p1-zlib/Config.in"
 endmenu
diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch
new file mode 100644
index 0000000000..d0a267b721
--- /dev/null
+++ b/package/erlang-p1-xmpp/0001-fix-includes.patch
@@ -0,0 +1,16 @@
+Without this patch, rebar fails to find include file fxml.hrl.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/include/xmpp.hrl b/include/xmpp.hrl
+index afa5f61..678858e 100644
+--- a/include/xmpp.hrl
++++ b/include/xmpp.hrl
+@@ -26,7 +26,7 @@
+ -include("ns.hrl").
+ -include("jid.hrl").
+ -include("xmpp_codec.hrl").
+--include("fxml.hrl").
++-include_lib("p1_xml/include/fxml.hrl").
+
+ -type stanza() :: iq() | presence() | message().
diff --git a/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 0000000000..fa5c269c22
--- /dev/null
+++ b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,18 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/rebar.config b/rebar.config
+index 79494b7..8d769f1 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -24,9 +24,6 @@
+ 	    {i, "../fast_xml/include"},
+ 	    {i, "deps/fast_xml/include"}]}.
+
+-{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.22"}}},
+-	{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}}]}.
+-
+ {cover_enabled, true}.
+ {cover_export_enabled, true}.
diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in
new file mode 100644
index 0000000000..1d518e2023
--- /dev/null
+++ b/package/erlang-p1-xmpp/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ERLANG_P1_XMPP
+	bool "erlang-p1-xmpp"
+	select BR2_PACKAGE_ERLANG_P1_XML
+	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	help
+	  XMPP library for Erlang.
+
+	  https://github.com/processone/xmpp
diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
new file mode 100644
index 0000000000..f245c843e8
--- /dev/null
+++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 e7b5db5ab6204f5bc6ebf91a183ebeae2b43ca6372dd2506599a8e8168a99c50 erlang-p1-xmpp-1.1.9.tar.gz
diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
new file mode 100644
index 0000000000..149d8bc5c7
--- /dev/null
+++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# erlang-p1-xmpp
+#
+################################################################################
+
+ERLANG_P1_XMPP_VERSION = 1.1.9
+ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
+ERLANG_P1_XMPP_LICENSE = Apache-2.0
+ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
+ERLANG_P1_XMPP_INSTALL_STAGING = YES
+ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
+	host-erlang-p1-xml
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))
-- 
2.11.0

  parent reply	other threads:[~2017-05-30 14:52 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-30 14:51 [Buildroot] [PATCH 00/16] Bump ejabberd version to 17.04 Johan Oudinet
2017-05-30 14:51 ` [Buildroot] [PATCH 01/16] erlang-goldrush: bump version to 0.1.9 Johan Oudinet
2017-05-30 14:51 ` [Buildroot] [PATCH 02/16] erlang-lager: bump to version 3.2.1 Johan Oudinet
2017-05-30 14:51 ` [Buildroot] [PATCH 03/16] erlang-p1-utils: bump to version 1.0.8 Johan Oudinet
2017-05-30 14:51 ` [Buildroot] [PATCH 04/16] erlang-p1-zlib: bump to version 1.0.2 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 05/16] erlang-p1-cache-tab: bump to version 1.0.7 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 06/16] erlang-p1-iconv: bump to version 1.0.4 Johan Oudinet
2017-05-30 22:05   ` Thomas Petazzoni
2017-05-30 14:52 ` [Buildroot] [PATCH 07/16] erlang-p1-stringprep: bump to version 1.0.8 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 08/16] erlang-p1-tls: bump to version 1.0.11 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 09/16] erlang-p1-stun: bump to version 1.0.10 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 10/16] erlang-p1-sip: bump to version 1.0.11 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 11/16] erlang-p1-xml: bump to version 1.1.22 Johan Oudinet
2017-05-30 22:06   ` Thomas Petazzoni
2017-05-30 14:52 ` [Buildroot] [PATCH 12/16] erlang-p1-yaml: bump to version 1.0.9 Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 13/16] erlang-jiffy: New package Johan Oudinet
2017-05-30 22:07   ` Thomas Petazzoni
2017-05-31  9:05     ` Johan Oudinet
2017-05-31  9:19       ` Thomas Petazzoni
2017-05-31 11:42         ` Johan Oudinet
2017-05-30 14:52 ` [Buildroot] [PATCH 14/16] erlang-p1-oauth: " Johan Oudinet
2017-05-30 22:08   ` Thomas Petazzoni
     [not found]     ` <20170530230314.GN2009@localhost>
2017-05-31  7:28       ` Thomas Petazzoni
2017-05-30 14:52 ` Johan Oudinet [this message]
2017-05-30 22:08   ` [Buildroot] [PATCH 15/16] erlang-p1-xmpp: " Thomas Petazzoni
2017-05-30 14:52 ` [Buildroot] [PATCH 16/16] ejabberd: bump to version 17.04 Johan Oudinet
2017-05-30 22:10   ` Thomas Petazzoni
2017-05-30 22:04 ` [Buildroot] [PATCH 00/16] Bump ejabberd version to 17.04 Thomas Petazzoni
2017-05-31  8:49   ` Johan Oudinet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170530145211.15320-16-johan.oudinet@gmail.com \
    --to=johan.oudinet@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.