Date: Sat, 23 Jan 2016 16:46:11 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407042 - head/Mk/Uses Message-ID: <201601231646.u0NGkBNd080621@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Sat Jan 23 16:46:11 2016 New Revision: 407042 URL: https://svnweb.freebsd.org/changeset/ports/407042 Log: 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). Modified: head/Mk/Uses/elixir.mk Modified: head/Mk/Uses/elixir.mk ============================================================================== --- head/Mk/Uses/elixir.mk Sat Jan 23 16:03:32 2016 (r407041) +++ head/Mk/Uses/elixir.mk Sat Jan 23 16:46:11 2016 (r407042) @@ -72,7 +72,14 @@ RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR} .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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601231646.u0NGkBNd080621>