git: beba8b0b8d2c - main - lang/rust-bootstrap: add powerpc64 flavor

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=beba8b0b8d2c969c885ab0e92e19fd75339c5381

commit beba8b0b8d2c969c885ab0e92e19fd75339c5381
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-12-29 21:16:45 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-12-29 21:16:45 +0000

    lang/rust-bootstrap: add powerpc64 flavor
---
 lang/rust-bootstrap/Makefile | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index 8cdeb643b7e4..316dc5ca71d4 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -27,15 +27,11 @@ BUILD_DEPENDS=	${FLAVOR:S/_/-/g}-freebsd-sysroot>=a2021.09.14:devel/freebsd-sysr
 		gmake:devel/gmake \
 		rust>=${PORTVERSION}:lang/rust
 
-FLAVORS=	aarch64 amd64 armv7 i386 \
-		powerpc64le powerpc riscv64
+FLAVORS=	aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le riscv64
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cpe ninja:build perl5 python:3.6+,build tar:xz
 CPE_VENDOR=	${PORTNAME}-lang
-.if ${FLAVOR} == powerpc64_elfv1
-USE_GCC=	9:build
-.endif
 # for openssl-src crate
 USE_PERL5=	build
 PATCHDIR=	${.CURDIR}/../rust/files
@@ -50,8 +46,7 @@ NO_ARCH=	yes
 _CARGO_VENDOR_DIR=			${WRKSRC}/vendor
 _RUST_ARCH_amd64=			x86_64
 _RUST_ARCH_i386=			i686
-_RUST_ARCH_powerpc64_elfv1=		powerpc64
-_RUST_ARCH_powerpc64_elfv2=		powerpc64
+_RUST_ARCH_powerpc64=			powerpc64
 _RUST_ARCH_riscv64=			riscv64gc
 _RUST_HOST=				${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
 _RUST_TARGET=				${_RUST_ARCH_${FLAVOR}:U${FLAVOR}}-unknown-${OPSYS:tl}
@@ -61,8 +56,7 @@ _RUST_LLVM_TARGET_amd64=		X86
 _RUST_LLVM_TARGET_armv6=		ARM
 _RUST_LLVM_TARGET_armv7=		ARM
 _RUST_LLVM_TARGET_i386=			X86
-_RUST_LLVM_TARGET_powerpc64_elfv1=	PowerPC
-_RUST_LLVM_TARGET_powerpc64_elfv2=	PowerPC
+_RUST_LLVM_TARGET_powerpc64=		PowerPC
 _RUST_LLVM_TARGET_powerpc64le=		PowerPC
 _RUST_LLVM_TARGET_powerpc=		PowerPC
 _RUST_LLVM_TARGET_riscv64=		RISCV
@@ -84,14 +78,6 @@ post-patch:
 # Disable vendor checksums
 	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
 		${_CARGO_VENDOR_DIR}/*/.cargo-checksum.json
-.if ${FLAVOR} == powerpc64_elfv1
-	@${REINPLACE_CMD} -e 's,"c++","stdc++",g' \
-		${WRKSRC}/compiler/rustc_llvm/build.rs
-	@${REINPLACE_CMD} -e 's,%CC%,${CC},g' \
-		-e 's,%WRKDIR%,${LOCALBASE}/freebsd-sysroot/powerpc64-elfv1,g' \
-		${WRKSRC}/compiler/rustc_llvm/build.rs \
-		${WRKSRC}/src/bootstrap/native.rs
-.endif
 
 do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
@@ -118,9 +104,6 @@ do-configure:
 	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'link-shared=false' >> ${WRKSRC}/config.toml
-.if ${FLAVOR} == powerpc64_elfv1
-	@${ECHO_CMD} 'static-libstdcpp=true' >> ${WRKSRC}/config.toml
-.endif
 .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
 	@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml
 .else
@@ -157,11 +140,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/rust-bootstrap/${FLAVOR}
 	${INSTALL_DATA} ${WRKDIR}/_build/dist/*-${_RUST_ARCH_${FLAVOR}:U${FLAVOR}}-unknown-${OPSYS:tl}${EXTRACT_SUFX} \
 		${STAGEDIR}${PREFIX}/rust-bootstrap/${FLAVOR}
-.if ${FLAVOR:Mpowerpc64_*}
-	@cd ${STAGEDIR}${PREFIX}/rust-bootstrap/${FLAVOR} && for f in *${EXTRACT_SUFX}; do \
-		${MV} $$f $${f%%${EXTRACT_SUFX}}-${FLAVOR:S/_/ /:[2]}${EXTRACT_SUFX}; \
-	done
-.endif
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} rust-bootstrap -type f >> ${TMPPLIST}