35d46ba365
There are new dependencies: erlang-p1-jiffy, erlang-p1-oauth2, erlang-p1-stun, erlang-p1-tls, erlang-p1-utils, erlang-p1-xmpp as well as two host dependencies on erlang-p1-utils and erlang-p1-xmpp. Otherwise the compilation via rebar fails. 4 patches have been refreshed and a new patch have been introduced to tell rebar to use host dependencies instead of trying to download them. Hopefully this patch could be drop in ejabberd 17.06. Missing SoB in patches have been added as well. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
95 lines
4.9 KiB
Diff
95 lines
4.9 KiB
Diff
From d399ecdd99e62b5554210a3b5c733e738e4d54be Mon Sep 17 00:00:00 2001
|
|
From: Philipp Huebner <debalance@debian.org>
|
|
Date: Wed, 20 Jan 2016 08:08:42 -0500
|
|
Subject: [PATCH] remove dependencies from rebar config
|
|
|
|
Without this patch, dependencies would be downloaded and compiled
|
|
by rebar at build time.
|
|
|
|
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
|
|
|
|
diff --git a/rebar.config b/rebar.config
|
|
index aef3a017..71937023 100644
|
|
--- a/rebar.config
|
|
+++ b/rebar.config
|
|
@@ -18,63 +18,6 @@
|
|
%%%
|
|
%%%----------------------------------------------------------------------
|
|
|
|
-{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}},
|
|
- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.8"}}},
|
|
- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.7"}}},
|
|
- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}},
|
|
- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}},
|
|
- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.21"}}},
|
|
- {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.9"}}},
|
|
- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.10"}}},
|
|
- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.11"}}},
|
|
- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.9"}}},
|
|
- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
|
|
- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
|
|
- {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
|
|
- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
|
|
- {tag, "1.0.2"}}}},
|
|
- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
|
|
- {tag, "1.1.2"}}}},
|
|
- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
|
|
- {tag, "1.1.5"}}}},
|
|
- {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
|
|
- {tag, "1.0.2"}}}},
|
|
- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
|
|
- {tag, "1.0.2"}}}},
|
|
- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
|
|
- {tag, "2.4.1"}}}},
|
|
- %% Elixir support, needed to run tests
|
|
- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
|
|
- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}},
|
|
- %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
|
|
- {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*",
|
|
- {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
|
|
- {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
|
|
- {tag, "1.0.4"}}}},
|
|
- {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
|
|
- {tag, "0.8.4"}}}},
|
|
- {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
|
|
- {tag, "1.0.5c"}}}},
|
|
- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
|
|
- {tag, "v1.0.8"}}}}]}.
|
|
-
|
|
-{if_var_true, latest_deps,
|
|
- {floating_deps, [cache_tab,
|
|
- fast_tls,
|
|
- stringprep,
|
|
- fast_xml,
|
|
- esip,
|
|
- luerl,
|
|
- stun,
|
|
- fast_yaml,
|
|
- xmpp,
|
|
- p1_utils,
|
|
- p1_mysql,
|
|
- p1_pgsql,
|
|
- epam,
|
|
- ezlib,
|
|
- iconv]}}.
|
|
-
|
|
{erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl"]}.
|
|
|
|
{erl_opts, [nowarn_deprecated_function,
|
|
@@ -142,15 +85,6 @@
|
|
{if_version_above, "17", {cover_enabled, true}}.
|
|
{cover_export_enabled, true}.
|
|
|
|
-{post_hook_configure, [{"fast_tls", []},
|
|
- {"stringprep", []},
|
|
- {"fast_yaml", []},
|
|
- {"esip", []},
|
|
- {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
|
|
- {if_var_true, pam, {"epam", []}},
|
|
- {if_var_true, zlib, {"ezlib", []}},
|
|
- {if_var_true, iconv, {"iconv", []}}]}.
|
|
-
|
|
{port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
|
|
|
|
{port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
|