From 7d7a41d70c9103c1645187712f3eca032413fb6c Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 23 Jan 2016 16:46:11 +0000 Subject: Do not try to depend on Erlang libraries (if any) in ELIXIR_LIB_ROOT, because they do not exist there. This fixes r406955 for fmake compatibility (on 9.3). --- Mk/Uses/elixir.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Mk/Uses') diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk index b40b608d7b1..a94cc4f25af 100644 --- a/Mk/Uses/elixir.mk +++ b/Mk/Uses/elixir.mk @@ -72,7 +72,14 @@ RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend} .if !target(do-build) do-build: .if ${MIX_REWRITE} != "" - @${REINPLACE_CMD} -i '' -E -e "s@{.*(only|optional): .*},?@@; s@{ *:([a-zA-Z0-9_]+), *(github:|\").*}@{ :\1, path: \"${ELIXIR_LIB_ROOT}/\\1\", compile: false }@" ${WRKSRC}/mix.exs + @${REINPLACE_CMD} -i '' -E -e "s@{.*(only|optional): .*},?@@" ${WRKSRC}/mix.exs +.for depend in ${MIX_BUILD_DEPS} + @if [ $$(echo ${depend:T} | sed -e "s/erlang-//") != ${depend:T} ]; then \ + ${REINPLACE_CMD} -i '' -E -e "s@{ *:(${depend:T:S/erlang-//}), *(github:|\").*} *,?@@" ${WRKSRC}/mix.exs; \ + else \ + ${REINPLACE_CMD} -i '' -E -e "s@{ *:(${depend:T:S/elixir-//}), *(github:|\").*}@{ :\1, path: \"${ELIXIR_LIB_ROOT}/\\1\", compile: false }@" ${WRKSRC}/mix.exs; \ + fi +.endfor .endif @${RM} -f ${WRKSRC}/mix.lock @cd ${WRKSRC} && ${MIX_COMPILE} -- cgit