Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Nov 2023 15:38:25 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 09edafd0e537 - main - devel/xtoolchain-llvm-devel: Remove port
Message-ID:  <202311021538.3A2FcPMt026454@gitrepo.freebsd.org>

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

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

commit 09edafd0e5373fe1a8a94275fe468e1e99471e83
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-11-02 14:27:13 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-11-02 15:25:39 +0000

    devel/xtoolchain-llvm-devel: Remove port
    
    Subsumed into devel/llvm-devel and no consumer remaining.
    
    Approved by:    brooks (private mail)
---
 MOVED                                              |  1 +
 devel/Makefile                                     |  1 -
 devel/xtoolchain-llvm-devel/Makefile               | 57 ----------------------
 devel/xtoolchain-llvm-devel/files/xtoolchain.mk.in |  6 ---
 devel/xtoolchain-llvm-devel/pkg-descr              |  1 -
 5 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/MOVED b/MOVED
index c633270d8e56..a92e6ea3899f 100644
--- a/MOVED
+++ b/MOVED
@@ -7955,3 +7955,4 @@ textproc/xalan-c||2023-10-28|Has expired: Upstream no longer continuing; please
 www/homer|www/homer-web|2023-11-01|Rename port to be consistent with Arch
 textproc/rubygem-yarp|textproc/rubygem-prism|2023-11-01|Remove obsoleted port. Use textproc/rubygem-prism instead
 audio/p5-MIDI|audio/p5-MIDI-Perl|2023-11-01|Move audio/p5-MIDI to audio/p5-MIDI-Perl
+devel/xtoolchain-llvm-devel||2023-11-02|Subsumed into devel/llvm-devel
diff --git a/devel/Makefile b/devel/Makefile
index 4d3b509a4ade..66d405c561af 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -7863,7 +7863,6 @@
     SUBDIR += xtensa-esp32-elf
     SUBDIR += xtl
     SUBDIR += xtl-quant-stack
-    SUBDIR += xtoolchain-llvm-devel
     SUBDIR += xwpe
     SUBDIR += xxgdb
     SUBDIR += xxhash
diff --git a/devel/xtoolchain-llvm-devel/Makefile b/devel/xtoolchain-llvm-devel/Makefile
deleted file mode 100644
index 5f49928bff1b..000000000000
--- a/devel/xtoolchain-llvm-devel/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	xtoolchain
-.ifndef NO_LLD_LINK
-PORTVERSION=	0.1
-.else
-PORTVERSION=	0.2
-.endif
-CATEGORIES=	devel
-MASTER_SITES=	# none
-DISTFILES=	# none
-PKGNAMESUFFIX?=	-llvm${LLVM_SUFFIX}
-
-MAINTAINER?=	brooks@FreeBSD.org
-COMMENT=	Pre seeded toolchain to cross build FreeBSD base
-
-LLVM_SUFFIX?=	-devel
-
-.if ${LLVM_SUFFIX} == "-devel"
-IGNORE=	Subsumed into devel/llvm-devel
-.endif
-
-NO_BUILD=	yes
-
-XCC?=		clang${LLVM_SUFFIX}
-XCXX?=		clang++${LLVM_SUFFIX}
-XCPP?=		clang-cpp${LLVM_SUFFIX}
-XLD?=		${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld.lld
-X_COMPILER_TYPE?=	clang
-
-RUN_DEPENDS?=	${XCC}:devel/llvm${LLVM_SUFFIX}
-
-SUB_FILES=	xtoolchain.mk
-SUB_LIST=	XCC=${XCC} \
-		XCXX=${XCXX} \
-		XCPP=${XCPP} \
-		XLD=${XLD} \
-		X_COMPILER_TYPE=${X_COMPILER_TYPE}
-
-PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
-.ifndef NO_LLD_LINK
-PLIST_FILES+=	llvm${LLVM_SUFFIX}/bin/ld
-.endif
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
-	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
-		${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
-
-.ifndef NO_LLD_LINK
-# XXX: would be better to add -fuse-ld=lld to LDFLAGS, but there isn't
-# yet a mechansim for that.  Link added here, not in devel/llvm* to avoid
-# forcing lld on all users.
-post-install:
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin
-	@${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/xtoolchain-llvm-devel/files/xtoolchain.mk.in b/devel/xtoolchain-llvm-devel/files/xtoolchain.mk.in
deleted file mode 100644
index 6cecf71f4812..000000000000
--- a/devel/xtoolchain-llvm-devel/files/xtoolchain.mk.in
+++ /dev/null
@@ -1,6 +0,0 @@
-XCC=%%LOCALBASE%%/bin/%%XCC%%
-XCXX=%%LOCALBASE%%/bin/%%XCXX%%
-XCPP=%%LOCALBASE%%/bin/%%XCPP%%
-XLD=%%XLD%%
-CROSS_BINUTILS_PREFIX=/var/empty
-X_COMPILER_TYPE=%%X_COMPILER_TYPE%%
diff --git a/devel/xtoolchain-llvm-devel/pkg-descr b/devel/xtoolchain-llvm-devel/pkg-descr
deleted file mode 100644
index 89be1144c811..000000000000
--- a/devel/xtoolchain-llvm-devel/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Pre seeded cross toolchain definition to cross build FreeBSD base



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