rebar3: still fails to build due to network calls.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rebar3: still fails to build due to network calls.
From: nikita <nikita%NetBSD.org@localhost>
Date: Tue, 05 Apr 2022 18:41:37 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Apr 5 20:41:37 2022 +0200
Changeset:	a9657f6ecc6e8f3e9f310aa49a7ba7604c7a889b

Modified Files:
	rebar3/Makefile
	rebar3/distinfo
Added Files:
	rebar3/patches/patch-bootstrap

Log Message:
rebar3: still fails to build due to network calls.

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

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

diffstat:
 rebar3/Makefile                | 39 ++++++++++++++++----------
 rebar3/distinfo                | 62 ++++++++++++++++++++----------------------
 rebar3/patches/patch-bootstrap | 29 ++++++++++++++++++++
 3 files changed, 83 insertions(+), 47 deletions(-)

diffs:
diff --git a/rebar3/Makefile b/rebar3/Makefile
index f13c03cee9..ca3f39d804 100644
--- a/rebar3/Makefile
+++ b/rebar3/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2019/11/03 10:39:29 rillig Exp $
 
-DISTNAME=	rebar3-3.13.2
+DISTNAME=	rebar3-3.18.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
 DIST_SUBDIR=	rebar3
@@ -12,19 +12,20 @@ LICENSE=	apache-2.0
 
 USE_TOOLS+=	tar
 
-REBAR_DEPS+=	bbmustache-1.8.0
-REBAR_DEPS+=	certifi-2.5.1
-REBAR_DEPS+=	cf-0.2.2
-REBAR_DEPS+=	cth_readable-1.4.6
-REBAR_DEPS+=	erlware_commons-1.3.1
+REBAR_DEPS+=	bbmustache-1.12.2
+REBAR_DEPS+=	certifi-2.8.0
+REBAR_DEPS+=	cf-0.3.1
+REBAR_DEPS+=	cth_readable-1.5.1
+REBAR_DEPS+=	erlware_commons-1.5.0
 REBAR_DEPS+=	eunit_formatters-0.5.0
 REBAR_DEPS+=	getopt-1.0.1
-REBAR_DEPS+=	parse_trans-3.3.0
-REBAR_DEPS+=	providers-1.8.1
-REBAR_DEPS+=	relx-3.33.0
-REBAR_DEPS+=	ssl_verify_fun-1.1.5
+REBAR_DEPS+=	providers-1.9.0
+REBAR_DEPS+=	relx-4.6.0
+REBAR_DEPS+=	ssl_verify_fun-1.1.6
 
 MAKE_ENV+=	DEBUG=1
+MAKE_ENV+=	HOME=${WRKDIR}
+MAKE_ENV+=	REBAR_NO_VERIFY_REPO_ORIGIN=1
 
 DISTFILES=	${DEFAULT_DISTFILES}
 
@@ -62,15 +63,23 @@ build-cache:
 # .endfor
 
 post-extract:
-	${MKDIR} -p ${WRKSRC}/_build/bootstrap/lib
 .for dep in ${REBAR_DEPS}
-	cd ${WRKSRC}/_build/default/lib/${dep:C/-.*//} && \
-		${TAR} -xzf contents.tar.gz
-	${LN} -sf ../../default/lib/${dep:C/-.*//} \
-		${WRKSRC}/_build/bootstrap/lib/${dep:C/-.*//}
+	${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-.*//}
+.endfor
+	${MKDIR} ${WRKSRC}/_build/bootstrap/lib
+	${MKDIR} ${WRKSRC}/_build/bootstrap/plugins
+.for dep in ${REBAR_DEPS}
+	${LN} -sf ${WRKSRC}/_build/default/lib/${dep:C/-.*//} ${WRKSRC}/_build/bootstrap/lib/
+.endfor
+.for dep in ${REBAR_DEPS}
+	${LN} -sf ${WRKSRC}/_build/default/plugins/${dep:C/-.*//} ${WRKSRC}/_build/bootstrap/plugins/
 .endfor
 
 do-build:
+	${RM} ${WRKSRC}/rebar.lock
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} escript ./bootstrap
 
 do-install:
diff --git a/rebar3/distinfo b/rebar3/distinfo
index d3087ea2be..cd8c0b3590 100644
--- a/rebar3/distinfo
+++ b/rebar3/distinfo
@@ -1,38 +1,36 @@
 $NetBSD: distinfo,v 1.1 2018/09/13 14:56:43 fhajny Exp $
 
-RMD160 (rebar3/bbmustache-1.8.0.tar) = 10586259b3b1654693d63995c854e781c1637678
-SHA512 (rebar3/bbmustache-1.8.0.tar) = 210c512836384797907cc29d4e907e6bfd46ec3389715a1c7b2c374f54429c0b1c1aacf149800dfbf2805569dd5508ecb90db9645d707596572db31fa7a491ef
-Size (rebar3/bbmustache-1.8.0.tar) = 15872 bytes
-RMD160 (rebar3/certifi-2.5.1.tar) = ebb0fa57e6c92479440189e4a3bf97b2712b3a20
-SHA512 (rebar3/certifi-2.5.1.tar) = 478126f314065d6d91f6854b9565461ca0c3d31265b952bbe6eb3643e861ee1faeba388c2d356d3595381aa3a5d5871c7c98cb85d8e6ab614917eb5c8be9082a
-Size (rebar3/certifi-2.5.1.tar) = 133120 bytes
-RMD160 (rebar3/cf-0.2.2.tar) = dd29208633b291a38d4e76d71a7c32d16b724ec5
-SHA512 (rebar3/cf-0.2.2.tar) = 0afbe335c6170f1f4efa6fb22111d8698abc288b1cc125fb69653958df1dbdb1a936f927309b460dc6cfa1fc2b15c82838b8935d5fa8e28dab1c050295608698
-Size (rebar3/cf-0.2.2.tar) = 10240 bytes
-RMD160 (rebar3/cth_readable-1.4.6.tar) = cdd39b0f4bf6dccbc84e739d6cc1355d150e920a
-SHA512 (rebar3/cth_readable-1.4.6.tar) = 716446ca8c585e4a510b2fc19c8dcb3a103867a234fab30ec68d035310b9901ff5c7606e9312462f73620c9d2d7733c0616149659ae767379e540f53fa0ae67f
-Size (rebar3/cth_readable-1.4.6.tar) = 18944 bytes
-RMD160 (rebar3/erlware_commons-1.3.1.tar) = 67d699cfb5c1bead910bf0830582422ea1760098
-SHA512 (rebar3/erlware_commons-1.3.1.tar) = 1f9e7617b88ec7cae6e83da1a60a2d22ce3325b6425cd284c3ec3dd0de49a26220b868ea60a937758dd65d7ea137819e314504a98ced99fc2617056ada4d2fa0
-Size (rebar3/erlware_commons-1.3.1.tar) = 53248 bytes
-RMD160 (rebar3/eunit_formatters-0.5.0.tar) = f2c8426098b272e67e6bb11b4c328023ed5bdd74
+BLAKE2s (rebar3/bbmustache-1.12.2.tar) = 32ead8f53518aa6dc2d16f4136f6aa7dba0edcbc2d3066c59cd81bf033929812
+SHA512 (rebar3/bbmustache-1.12.2.tar) = aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
+Size (rebar3/bbmustache-1.12.2.tar) = 17920 bytes
+BLAKE2s (rebar3/certifi-2.8.0.tar) = 71b7970ab6cf2ed86f02529a31d5056639a75eb7b65584a78f4c539e1058896c
+SHA512 (rebar3/certifi-2.8.0.tar) = 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
+Size (rebar3/certifi-2.8.0.tar) = 153088 bytes
+BLAKE2s (rebar3/cf-0.3.1.tar) = f001900e6df6a33021788f72e44656eefebd8a76b6b3281a53ff469aea4569c8
+SHA512 (rebar3/cf-0.3.1.tar) = 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
+Size (rebar3/cf-0.3.1.tar) = 10240 bytes
+BLAKE2s (rebar3/cth_readable-1.5.1.tar) = 6417eae68a7dbcaf43be90dd5c18d69f1e03fedcc55d4425f3890d8a79045b65
+SHA512 (rebar3/cth_readable-1.5.1.tar) = 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
+Size (rebar3/cth_readable-1.5.1.tar) = 19968 bytes
+BLAKE2s (rebar3/erlware_commons-1.5.0.tar) = 856abbf4189bcc407927b6e8a021b972fb968e555695770547c95ffe0d98bdc0
+SHA512 (rebar3/erlware_commons-1.5.0.tar) = 215072e79da4edf51ac6889721c0d4cefbee60fd5e2a803b39acdd2735b5e91f2df690b94f14a9814f63a4cd3e4762e8d7f87f6debb3e659e542a6dda5159739
+Size (rebar3/erlware_commons-1.5.0.tar) = 53760 bytes
+BLAKE2s (rebar3/eunit_formatters-0.5.0.tar) = a950f935b72499a53aaccdc269ea91465c95e81b81e2fd90073eb401d1c1896a
 SHA512 (rebar3/eunit_formatters-0.5.0.tar) = e8692ff35f979dfaf99ccac58014429d300a71ff76f2ce945814a0d4d9431821f04f988dc0271271858a37e6903a73b4dd9ae3abf215333f3135fa883ec07022
 Size (rebar3/eunit_formatters-0.5.0.tar) = 14848 bytes
-RMD160 (rebar3/getopt-1.0.1.tar) = 46610e303d9fefd8da57ace5ddfef98d04fa68a9
+BLAKE2s (rebar3/getopt-1.0.1.tar) = c569953af866ab03369962937ebcd66a79d3f5b7d29e8e7514e2f93e50e6dda5
 SHA512 (rebar3/getopt-1.0.1.tar) = 859642dc26c42414474fa8af8a32fed827b0773ac6d6eb51ec19c291672408e71619ad2bb0c7f08d84ff591b33a655a7e0b6241b94372e9cc816a648ee6cdaf6
 Size (rebar3/getopt-1.0.1.tar) = 19456 bytes
-RMD160 (rebar3/parse_trans-3.3.0.tar) = e75e187eeb177018ed65893368537024b73d9b70
-SHA512 (rebar3/parse_trans-3.3.0.tar) = a633bc87458d9eeb335f95c4f23d4a7b70b4bef2b8a17d1fb9500f6dcf77dbed2d767b926453aa9082efd098b6ba83c06a76c839323eb54906956caf67a5ad4f
-Size (rebar3/parse_trans-3.3.0.tar) = 35840 bytes
-RMD160 (rebar3/providers-1.8.1.tar) = 8f49cfd6484c02d02d051b78f9ab1b44fcb60f49
-SHA512 (rebar3/providers-1.8.1.tar) = b1db18264c98717849ed521f8eb1ef0f112ea5e602bcd529fd97996120640c7567097174180673ba166d4c408496ce63c351ce70a3f385ed1ae7d1e444e2587a
-Size (rebar3/providers-1.8.1.tar) = 14336 bytes
-RMD160 (rebar3/rebar3-3.13.2.tar.gz) = 1ec86e5714bcd9a05c71ba4ffcbe0c3c2bc9cf56
-SHA512 (rebar3/rebar3-3.13.2.tar.gz) = 151307780a79069dd6817346c381a8550e50023db72a49fcc7c6dec8e42abd1334425a95071fa5c09a7e16d6ea8035aed5b53cfb66ce693bf4dcfc316e00811e
-Size (rebar3/rebar3-3.13.2.tar.gz) = 380862 bytes
-RMD160 (rebar3/relx-3.33.0.tar) = 0a0302f0cb3431306a0902203ea55c0cdd7f8085
-SHA512 (rebar3/relx-3.33.0.tar) = bdb99853b0d37809aa98852b02c46c80f73b5dd1331995e1f4438b2c7fa2555b41244610a6a6dd21caafbf58d747ff5de69f974ed458423fbb61be3947282031
-Size (rebar3/relx-3.33.0.tar) = 87552 bytes
-RMD160 (rebar3/ssl_verify_fun-1.1.5.tar) = 3a3a0c61ba76cb430ff4362b618e6e6c387ea24c
-SHA512 (rebar3/ssl_verify_fun-1.1.5.tar) = 9beef3fb7b1aa2e40202d321442159a502a6efdcac3d15397c0dfffef633a1f5af8baa006eb4437d14620ffc2e23018111f1626d2f34a63e804cd8e11fe17f71
-Size (rebar3/ssl_verify_fun-1.1.5.tar) = 17408 bytes
+BLAKE2s (rebar3/providers-1.9.0.tar) = 2e8cf8313cd61b9216a425bc6ae8992ece5bb7ef8f9eb66e935aee613b163785
+SHA512 (rebar3/providers-1.9.0.tar) = 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
+Size (rebar3/providers-1.9.0.tar) = 14848 bytes
+BLAKE2s (rebar3/rebar3-3.18.0.tar.gz) = 33c4028a20f32cff85db69561cf11d7c0f1f3d258419e8af1c6a7d3cf14ec9fc
+SHA512 (rebar3/rebar3-3.18.0.tar.gz) = 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
+Size (rebar3/rebar3-3.18.0.tar.gz) = 436403 bytes
+BLAKE2s (rebar3/relx-4.6.0.tar) = bd0f7939b6ee9a115b39d3086eaf84156cbdafd8a04ac14a2ad980850686c2f2
+SHA512 (rebar3/relx-4.6.0.tar) = a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
+Size (rebar3/relx-4.6.0.tar) = 75776 bytes
+BLAKE2s (rebar3/ssl_verify_fun-1.1.6.tar) = 000cb4e6d18aa9d0695306cb6b5de24a2cb559d3a59b28445d25be22ee9a296e
+SHA512 (rebar3/ssl_verify_fun-1.1.6.tar) = 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
+Size (rebar3/ssl_verify_fun-1.1.6.tar) = 14848 bytes
+SHA1 (patch-bootstrap) = 6535627766985cfe5127afe1a0e668b096f372fc
diff --git a/rebar3/patches/patch-bootstrap b/rebar3/patches/patch-bootstrap
new file mode 100644
index 0000000000..c2f76515e5
--- /dev/null
+++ b/rebar3/patches/patch-bootstrap
@@ -0,0 +1,29 @@
+$NetBSD$
+
+patch bootstrap to work within pkgsrc context.
+
+--- bootstrap.orig	2022-04-05 20:03:11.466752120 +0200
++++ bootstrap	2022-04-05 20:03:53.175125878 +0200
+@@ -13,18 +13,18 @@
+ 
+     %% Clear directories for builds since bootstrapping may require
+     %% a changed structure from an older one
+-    rm_rf("_build/bootstrap"),
++    %% rm_rf("_build/bootstrap"),
+     %% When recompiling rebar3 itself, the path swaps and cleaning
+     %% removes the modules in _build/bootstrap, but the VM still
+     %% manages to discover those in _build/prod from previous builds and
+     %% cause weird failures when compilers get modified between releases.
+-    rm_rf("_build/prod"),
++    %% rm_rf("_build/prod"),
+     %% The same pattern happens with default/ as well, particularly when
+     %% developing new things.
+     %% Keep other deps in <profile>/lib for build environments like Nix
+     %% where internet access is disabled that deps are not downloadable.
+-    rm_rf("_build/default/lib/rebar"),
+-    rm_rf("_build/test/lib/rebar"),
++    %% rm_rf("_build/default/lib/rebar"),
++    %% rm_rf("_build/test/lib/rebar"),
+ 
+     filelib:ensure_dir("_build/bootstrap/lib/rebar/ebin/"),
+
Prev by Date: wip-tools: wip-import: Tolerate cvs status failure
Next by Date: rebar3: delete unused code
Previous by Thread: wip-tools: wip-import: Tolerate cvs status failure
Next by Thread: rebar3: delete unused code
Indexes:
Home | Main Index | Thread Index | Old Index