Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jan 2016 23:27:40 +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: r406955 - head/Mk/Uses
Message-ID:  <201601222327.u0MNRe0H065611@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Fri Jan 22 23:27:40 2016
New Revision: 406955
URL: https://svnweb.freebsd.org/changeset/ports/406955

Log:
  Do not try to depend on Erlang libraries (if any) in
  ELIXIR_LIB_ROOT, because they do not exist there.

Modified:
  head/Mk/Uses/elixir.mk

Modified: head/Mk/Uses/elixir.mk
==============================================================================
--- head/Mk/Uses/elixir.mk	Fri Jan 22 23:26:28 2016	(r406954)
+++ head/Mk/Uses/elixir.mk	Fri Jan 22 23:27:40 2016	(r406955)
@@ -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 ${depend:T} != ${depend:T:S/erlang-//}
+	@${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
+.endif
+.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?201601222327.u0MNRe0H065611>