mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-04 16:40:36 +01:00
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
This commit is contained in:
parent
7c1e7e5b5f
commit
2d22d6061e
@ -273,5 +273,8 @@ AC_SUBST(iconv)
|
||||
AC_SUBST(debug)
|
||||
AC_SUBST(lager)
|
||||
AC_SUBST(tools)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
AC_OUTPUT
|
||||
|
@ -66,10 +66,15 @@ Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab"}},
|
||||
{oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git"}},
|
||||
{xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git"}}],
|
||||
|
||||
CFLags = proplists:get_value(cflags, Cfg, ""),
|
||||
CPPFLags = proplists:get_value(cppflags, Cfg, ""),
|
||||
LDFLags = proplists:get_value(ldflags, Cfg, ""),
|
||||
|
||||
ConfigureCmd = fun(Pkg, Flags) ->
|
||||
{'get-deps',
|
||||
"sh -c 'cd deps/" ++ Pkg ++
|
||||
" && ./configure" ++ Flags ++ "'"}
|
||||
" && CFLAGS=\""++ CFLags ++"\" CPPFLAGS=\""++ CPPFLags ++"\" LDFLAGS=\""++ LDFLags ++"\"" ++
|
||||
" ./configure" ++ Flags ++ "'"}
|
||||
end,
|
||||
|
||||
XMLFlags = lists:foldl(
|
||||
|
@ -47,6 +47,10 @@
|
||||
{libdir, "{{release_dir}}/lib"}.
|
||||
{docdir, "{{release_dir}}/doc"}.
|
||||
|
||||
{ldflags, "@LDFLAGS@"}.
|
||||
{cflags, "@CFLAGS@"}.
|
||||
{cppflags, "@CPPFLAGS@"}.
|
||||
|
||||
%% Local Variables:
|
||||
%% mode: erlang
|
||||
%% End:
|
||||
|
Loading…
Reference in New Issue
Block a user