Attachment #205758 for bug #239158




		LOCAL/tobik/rust:cargo_bootstrap
DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
DISTFILES?=	${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \
		${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
		${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
		${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap
DIST_SUBDIR?=	rust
EXTRACT_ONLY?=	${DISTFILES:N*\:*bootstrap:C/:.*//}


BOOTSTRAPS_SUFFIX_powerpc64?=	-elfv1

RUST_BOOTSTRAP_VERSION?=	1.35.0
RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}

CARGO_BOOTSTRAP_VERSION?=	0.36.0
CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}

CARGO_VENDOR_DIR?=		${WRKSRC}/vendor


		OPENSSL_DIR="${OPENSSLBASE}"
X_PY_CMD=	${PYTHON_CMD} ${WRKSRC}/x.py

RUST_STD_DIR=	${RUST_STD_BOOTSTRAP:T:R:R}

post-extract:
	@${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
		${WRKSRC}/build/cache/${RUSTC_BOOTSTRAP}.tar.gz
	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
		${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}.tar.gz
	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
		${WRKSRC}/build/cache/${CARGO_BOOTSTRAP}.tar.gz
	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \
		${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}

post-patch:
	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
		${WRKSRC}/src/etc/rust-gdb
	@${ECHO_MSG} "Canonical bootstrap date and version before patching:"
	@${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt
# If we override the versions and date of the bootstraps (for instance
# on aarch64 where we provide our own bootstraps), we need to update
# places where they are recorded.
	@${REINPLACE_CMD} -e 's,^date:.*,date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}},' \
		-e 's,^rustc:.*,rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}},' \
		-e 's,^cargo:.*,cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}},' \
		${WRKSRC}/src/stage0.txt
	@${REINPLACE_CMD} -e \
		's|^rustc:.*|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}|' \
		${WRKSRC}/src/stage0.txt
	@${REINPLACE_CMD} -e \
		's|^cargo:.*|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}|' \
		${WRKSRC}/src/stage0.txt
	@${ECHO_MSG} "Bootstrap date and version after patching:"
	@${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt
# Disable vendor checksums
	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
		's/"files":{[^}]*}/"files":{}/' \
		${CARGO_VENDOR_DIR}/*/.cargo-checksum.json

post-patch-SOURCES-off:

		${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \
		${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib
	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
		-f ${_DISTDIR}/${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
		rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
# `rust-std` bootstrap.
	${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}

		${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \
		${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}
	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
		-f ${_DISTDIR}/${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
		rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}

${BOOTSTRAPS_SOURCE_PKG}:

Return to bug 239158

Lines 12-20 Link Here

(-)Makefile (-31 / +20 lines)
12	LOCAL/tobik/rust:cargo_bootstrap	12	LOCAL/tobik/rust:cargo_bootstrap
13	DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src	13	DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src
14	DISTFILES?= ${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \	14	DISTFILES?= ${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \
15	${RUSTC_BOOTSTRAP}:rust_bootstrap \	15	${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
16	${RUST_STD_BOOTSTRAP}:rust_bootstrap \	16	${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
17	${CARGO_BOOTSTRAP}:cargo_bootstrap	17	${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap
18	DIST_SUBDIR?= rust	18	DIST_SUBDIR?= rust
19	EXTRACT_ONLY?= ${DISTFILES:N\:bootstrap:C/:.*//}	19	EXTRACT_ONLY?= ${DISTFILES:N\:bootstrap:C/:.*//}
20		20
Lines 43-53 Link Here
43	BOOTSTRAPS_SUFFIX_powerpc64?= -elfv1	43	BOOTSTRAPS_SUFFIX_powerpc64?= -elfv1
44		44
45	RUST_BOOTSTRAP_VERSION?= 1.35.0	45	RUST_BOOTSTRAP_VERSION?= 1.35.0
46	RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}${BOOTSTRAPS_SUFFIX}.tar.gz	46	RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
47	RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}${BOOTSTRAPS_SUFFIX}.tar.gz	47	RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
48		48
49	CARGO_BOOTSTRAP_VERSION?= 0.36.0	49	CARGO_BOOTSTRAP_VERSION?= 0.36.0
50	CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}${BOOTSTRAPS_SUFFIX}.tar.gz	50	CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}
51		51
52	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	52	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
53		53
Lines 108-148 Link Here
108	OPENSSL_DIR="${OPENSSLBASE}"	108	OPENSSL_DIR="${OPENSSLBASE}"
109	X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py	109	X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py
110		110
111	RUST_STD_DIR= ${RUST_STD_BOOTSTRAP:T:R:R}
112
113	post-extract:	111	post-extract:
114	@${MKDIR} \	112	@${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
115	${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} \	113	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
116	${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}	114	${WRKSRC}/build/cache/${RUSTC_BOOTSTRAP}.tar.gz
117	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \	115	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
118	${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}	116	${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}.tar.gz
119	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \	117	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
120	${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}	118	${WRKSRC}/build/cache/${CARGO_BOOTSTRAP}.tar.gz
121	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \
122	${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
123		119
124	post-patch:	120	post-patch:
125	@${REINPLACE_CMD} -e 's\|gdb\|${LOCALBASE}/bin/gdb\|' \	121	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
126	${WRKSRC}/src/etc/rust-gdb
127	@${ECHO_MSG} "Canonical bootstrap date and version before patching:"	122	@${ECHO_MSG} "Canonical bootstrap date and version before patching:"
128	@${GREP} -E '^(date\|rustc\|cargo)' ${WRKSRC}/src/stage0.txt	123	@${GREP} -E '^(date\|rustc\|cargo)' ${WRKSRC}/src/stage0.txt
129	# If we override the versions and date of the bootstraps (for instance	124	# If we override the versions and date of the bootstraps (for instance
130	# on aarch64 where we provide our own bootstraps), we need to update	125	# on aarch64 where we provide our own bootstraps), we need to update
131	# places where they are recorded.	126	# places where they are recorded.
132	@${REINPLACE_CMD} -e \	127	@${REINPLACE_CMD} -e 's,^date:.*,date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}},' \
133	's\|^date:.*\|date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}\|' \	128	-e 's,^rustc:.*,rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}},' \
		129	-e 's,^cargo:.*,cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}},' \
134	${WRKSRC}/src/stage0.txt	130	${WRKSRC}/src/stage0.txt
135	@${REINPLACE_CMD} -e \
136	's\|^rustc:.*\|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}\|' \
137	${WRKSRC}/src/stage0.txt
138	@${REINPLACE_CMD} -e \
139	's\|^cargo:.*\|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}\|' \
140	${WRKSRC}/src/stage0.txt
141	@${ECHO_MSG} "Bootstrap date and version after patching:"	131	@${ECHO_MSG} "Bootstrap date and version after patching:"
142	@${GREP} -E '^(date\|rustc\|cargo)' ${WRKSRC}/src/stage0.txt	132	@${GREP} -E '^(date\|rustc\|cargo)' ${WRKSRC}/src/stage0.txt
143	# Disable vendor checksums	133	# Disable vendor checksums
144	@${REINPLACE_CMD} -e \	134	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
145	's/"files":{[^}]*}/"files":{}/' \
146	${CARGO_VENDOR_DIR}/*/.cargo-checksum.json	135	${CARGO_VENDOR_DIR}/*/.cargo-checksum.json
147		136
148	post-patch-SOURCES-off:	137	post-patch-SOURCES-off:
Lines 325-331 Link Here
325	${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \	314	${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \
326	${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib	315	${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib
327	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \	316	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
328	-f ${_DISTDIR}/${RUSTC_BOOTSTRAP} \	317	-f ${_DISTDIR}/${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
329	rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}	318	rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
330	# `rust-std` bootstrap.	319	# `rust-std` bootstrap.
331	${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}	320	${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
Lines 334-340 Link Here
334	${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \	323	${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \
335	${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}	324	${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}
336	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \	325	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
337	-f ${_DISTDIR}/${RUST_STD_BOOTSTRAP} \	326	-f ${_DISTDIR}/${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
338	rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}	327	rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
339		328
340	${BOOTSTRAPS_SOURCE_PKG}:	329	${BOOTSTRAPS_SOURCE_PKG}: