diff options
| author | Johan Oudinet <johan.oudinet@gmail.com> | 2017-06-06 16:33:11 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-06 22:34:11 +0200 |
| commit | 35d46ba365c00d21f5101abb6e435fe1c29b5a86 (patch) | |
| tree | cff09831d569180c6a2565b77cfd40afdd541081 /package/ejabberd/0008-rebar-uses-host-dependencies.patch | |
| parent | 1b189ce2f7b0f6bc5eb881e0392c04405d5eca18 (diff) | |
| download | buildroot-35d46ba365c00d21f5101abb6e435fe1c29b5a86.tar.gz buildroot-35d46ba365c00d21f5101abb6e435fe1c29b5a86.zip | |
ejabberd: bump to version 17.04
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>
Diffstat (limited to 'package/ejabberd/0008-rebar-uses-host-dependencies.patch')
| -rw-r--r-- | package/ejabberd/0008-rebar-uses-host-dependencies.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/package/ejabberd/0008-rebar-uses-host-dependencies.patch b/package/ejabberd/0008-rebar-uses-host-dependencies.patch new file mode 100644 index 0000000000..45f387993e --- /dev/null +++ b/package/ejabberd/0008-rebar-uses-host-dependencies.patch @@ -0,0 +1,33 @@ +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) -> |
