From nobody Thu Dec 29 21:16:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Njh671m6hz1HwxF; Thu, 29 Dec 2022 21:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Njh6718crz3nJ0; Thu, 29 Dec 2022 21:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672348607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SAjODZcX3EeUt6vUFY7RC4WZ3lv8JvnfJ0U4mdNOCBo=; b=SDJwAjDefuStaiJ9rxnB4WYVRGzrWrKduVRA4Eb0Bl7ORsl2MnO/B8bCQSYE7FRwlV/MKp QhC7HDPaxwXDcjLlHUwjGd+mjLoFrDOD7NSrzsg2Co26oQC5Fs2uCTA6l2Fc2rZT7T56UY iqqCIIV6LsAy1WQnMJ/oqThare1n6jZj51f8ZYiimwiR1eF1gHlevGISLcB9x0AiaifZKR Ao6HTB2/+KNhlmcANdLAsFoSnYhUK/Hne0OtJHhmDU6iIglh6R17MyHSNqh0aBCRGz6Ied xpL2NOMzy9t5fFFvYqtUaoPx8uB8JCazLowRtHzar/c3XdtM3TDEQZNzxHwOSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672348607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SAjODZcX3EeUt6vUFY7RC4WZ3lv8JvnfJ0U4mdNOCBo=; b=ikj/VGSLEGh1UjZ27JG1eXgPC2orL3KLkPDE6Fn6v8e7AXisWLVB0DjuczueCqNmZOyteW Hy0r2fJYnSublrZ6KLfWuhwSjJ10t2JPDtH1Mcs2IfSUUvaHbtQTvrMZbj4HB5OTzYFkjz A3umSGq1RvXiSzk/x1eKWQnTLBDJXLGShGfpWMWIxHlwFTK2Pk+Lj9R8YqOmro5ok4YN8h lVCG97PqJ0vGAix4QDq3QLgsrQ0mgkp486EPcPVokqourcn8DvW61FMGiKG/c0SsDpBwMp c34uSVF4fI3Tk3pTYXH6HGp3VJSwVPb9PBPPBKR8lIQ5VxYFZG+8rp+0z4leiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672348607; a=rsa-sha256; cv=none; b=u4kji+RAoSxkWNq4M72Zs4NjM3ko3/RDMJVGXg4VkbIbdFtjRX01dhj4Fz90T3vwf1HvFB F2UIVVVxQVIF/Tt5sT/5SuV4QzWo842aI26qWQu4kKToGnJbMicPeccML/5NoZV+fXjPRV KyYWF9FNZWA20qJZLpvDv0SjIFxCzQtbDOeqybicQxqSJGtEqlvhn8SSxXn7RM6T2ToBDf 4ZI+9VtKesbwJG5u0jZbakq62LP+6tq9yfDKEPs7s8lwriVZHVebuDUepXrHhB19kMEknZ 7NIbGqzOm/+eFL7xS1T5MpT9gTTsrTg14mOu18tIhI8ov6AWsqmDxPjYZunTOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Njh670Blrzjtg; Thu, 29 Dec 2022 21:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BTLGkkH077221; Thu, 29 Dec 2022 21:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTLGk7H077220; Thu, 29 Dec 2022 21:16:46 GMT (envelope-from git) Date: Thu, 29 Dec 2022 21:16:46 GMT Message-Id: <202212292116.2BTLGk7H077220@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: beba8b0b8d2c - main - lang/rust-bootstrap: add powerpc64 flavor List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beba8b0b8d2c969c885ab0e92e19fd75339c5381 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=beba8b0b8d2c969c885ab0e92e19fd75339c5381 commit beba8b0b8d2c969c885ab0e92e19fd75339c5381 Author: Piotr Kubaj AuthorDate: 2022-12-29 21:16:45 +0000 Commit: Piotr Kubaj 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}