Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Apr 2023 09:43:40 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5ca2f295783a - main - devel/freebsd-sysroot: drop binutils dependency on powerpc
Message-ID:  <202304240943.33O9heJD088517@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

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

commit 5ca2f295783ad816faf2efc495bfe172a6bd955e
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-04-24 09:42:58 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-04-24 09:43:39 +0000

    devel/freebsd-sysroot: drop binutils dependency on powerpc
    
    Rust doesn't need it anymore.
---
 devel/freebsd-sysroot/Makefile             | 7 ++-----
 devel/freebsd-sysroot/files/powerpc-c++.in | 4 ----
 devel/freebsd-sysroot/files/powerpc-cc.in  | 4 ----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/devel/freebsd-sysroot/Makefile b/devel/freebsd-sysroot/Makefile
index bc43846c73d6..8c5ecc126d18 100644
--- a/devel/freebsd-sysroot/Makefile
+++ b/devel/freebsd-sysroot/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	freebsd-sysroot
 DISTVERSION=	a2023-03-23
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${_SYSROOT_DIST:@f@https://download.freebsd.org/$f?dummy=/:${FLAVOR}@} \
 		LOCAL/rust:${FLAVOR}
@@ -20,9 +21,6 @@ FLAVORS=	aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le \
 		powerpcspe riscv64
 FLAVOR?=	${FLAVORS:[1]}
 
-powerpc_BUILD_DEPENDS=		powerpc-binutils>0:devel/binutils@powerpc
-powerpc_RUN_DEPENDS=		powerpc-binutils>0:devel/binutils@powerpc
-
 QA_ENV=		IGNORE_QA_baselibs=1 \
 		IGNORE_QA_no_arch=1 \
 		IGNORE_QA_proxydeps=1 \
@@ -38,8 +36,7 @@ SUB_FILES=	${exists(${FILESDIR}/${FLAVOR}-c++.in):?${FLAVOR}-c++:} \
 SUB_LIST=	FREEBSD_SYSROOT="${_SYSROOT}" \
 		FREEBSD_SYSROOT_CC="${CC}" \
 		FREEBSD_SYSROOT_CXX="${CXX}" \
-		FREEBSD_SYSROOT_LLVM_TRIPLE="${_SYSROOT_LLVM_TRIPLE}" \
-		FREEBSD_SYSROOT_POWERPC_LD="$$(${ECHO_CMD} ${LOCALBASE}/bin/powerpc-unknown-${OPSYS:tl}*[0-9]-ld.bfd)"
+		FREEBSD_SYSROOT_LLVM_TRIPLE="${_SYSROOT_LLVM_TRIPLE}"
 PLIST=		${.CURDIR}/pkg-plist.${FLAVOR}
 PLIST_SUB=	ROOT=${_SYSROOT:S,^${PREFIX}/,,}
 
diff --git a/devel/freebsd-sysroot/files/powerpc-c++.in b/devel/freebsd-sysroot/files/powerpc-c++.in
deleted file mode 100644
index 771021e92bc9..000000000000
--- a/devel/freebsd-sysroot/files/powerpc-c++.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-: ${FREEBSD_SYSROOT_CXX:="%%FREEBSD_SYSROOT_CXX%%"}
-: ${FREEBSD_SYSROOT:="%%FREEBSD_SYSROOT%%"}
-exec "${FREEBSD_SYSROOT_CXX}" --sysroot="${FREEBSD_SYSROOT}" --target=%%FREEBSD_SYSROOT_LLVM_TRIPLE%% -Wno-unused-command-line-argument -fuse-ld="%%FREEBSD_SYSROOT_POWERPC_LD%%" -stdlib=libc++ "$@"
diff --git a/devel/freebsd-sysroot/files/powerpc-cc.in b/devel/freebsd-sysroot/files/powerpc-cc.in
deleted file mode 100644
index b731e232ea69..000000000000
--- a/devel/freebsd-sysroot/files/powerpc-cc.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-: ${FREEBSD_SYSROOT_CC:="%%FREEBSD_SYSROOT_CC%%"}
-: ${FREEBSD_SYSROOT:="%%FREEBSD_SYSROOT%%"}
-exec "${FREEBSD_SYSROOT_CC}" --sysroot="${FREEBSD_SYSROOT}" --target=%%FREEBSD_SYSROOT_LLVM_TRIPLE%% -Wno-unused-command-line-argument -fuse-ld="%%FREEBSD_SYSROOT_POWERPC_LD%%" "$@"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304240943.33O9heJD088517>