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>
34 lines
964 B
Diff
34 lines
964 B
Diff
Fix location of rebar dependencies.
|
|
|
|
Signed-off-by: Christophe Romain <cromain@process-one.net>
|
|
|
|
diff --git a/rebar.config.script b/rebar.config.script
|
|
index 19142b9e..9107af26 100644
|
|
--- a/rebar.config.script
|
|
+++ b/rebar.config.script
|
|
@@ -218,20 +218,10 @@ TestConfig = case file:read_file_info(TestConfigFile) of
|
|
""
|
|
end,
|
|
|
|
-ResolveDepPath = case IsRebar3 of
|
|
- true ->
|
|
- fun("deps/" ++ Rest) ->
|
|
- Slash = string:str(Rest, "/"),
|
|
- Dir = "_build/default/lib/" ++
|
|
- string:sub_string(Rest, 1, Slash - 1),
|
|
- Dir ++ string:sub_string(Rest, Slash);
|
|
- (Path) ->
|
|
- Path
|
|
- end;
|
|
- _ ->
|
|
- fun(P) ->
|
|
- P
|
|
- end
|
|
+ResolveDepPath = fun("deps/fast_xml/include") -> code:lib_dir(p1_xml) ++ "/include";
|
|
+ ("deps/xmpp/include") -> code:lib_dir(p1_xmpp) ++ "/include";
|
|
+ ("deps/p1_utils/include") -> code:lib_dir(p1_utils) ++ "/include";
|
|
+ (Path) -> Path
|
|
end,
|
|
|
|
CtParams = fun(CompileOpts) ->
|