pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rebar3: builds, Makefile needs cleanup!



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Apr 5 21:20:23 2022 +0200
Changeset:	976b8e9c2f99f628ebe3b6a9f040968831939d29

Modified Files:
	rebar3/Makefile

Log Message:
rebar3: builds, Makefile needs cleanup!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=976b8e9c2f99f628ebe3b6a9f040968831939d29

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rebar3/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diffs:
diff --git a/rebar3/Makefile b/rebar3/Makefile
index 72c64b3485..6305a16acd 100644
--- a/rebar3/Makefile
+++ b/rebar3/Makefile
@@ -41,7 +41,8 @@ EXTRACT_DIR.${dep}.tar=	${WRKSRC}/_build/default/lib/${dep:C/-.*//}
 SUBST_CLASSES+=		escript
 SUBST_STAGE.escript=	pre-configure
 SUBST_MESSAGE.escript=	Fix default escript shebang
-SUBST_FILES.escript=	src/rebar_prv_escriptize.erl
+SUBST_FILES.escript+=	bootstrap
+SUBST_FILES.escript+=	src/rebar_prv_escriptize.erl
 SUBST_SED.escript=	-e 's,/usr/bin/env escript,${PREFIX}/bin/escript,'
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/examples/rebar3
@@ -55,7 +56,7 @@ post-extract:
 	${MKDIR} ${WRKSRC}/_build/default/lib/${dep:C/-.*//}
 	${TAR} xOf ${DISTDIR}/${DIST_SUBDIR}/${dep}.tar contents.tar.gz | ${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${dep:C/-.*//}
 	${MKDIR} ${WRKSRC}/_checkouts/${dep:C/-.*//}
-	${TAR} xOf ${DISTDIR}/${DIST_SUBDIR}/${dep}.tar contents.tar.gz | ${TAR} xfz - -C ${WRKSRC}/_checkouts/${dep:C-.*//}
+	${TAR} xOf ${DISTDIR}/${DIST_SUBDIR}/${dep}.tar contents.tar.gz | ${TAR} xfz - -C ${WRKSRC}/_checkouts/${dep:C/-.*//}
 .endfor
 	${MKDIR} ${WRKSRC}/_build/bootstrap/lib
 	${MKDIR} ${WRKSRC}/_build/bootstrap/plugins
@@ -68,7 +69,7 @@ post-extract:
 
 do-build:
 	${RM} ${WRKSRC}/rebar.lock
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} escript ./bootstrap
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./bootstrap
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rebar3 ${DESTDIR}${PREFIX}/bin/


Home | Main Index | Thread Index | Old Index