svn commit: r446997 - in head: . devel devel/cloudabi-binutils-aarch64 devel/cloudabi-binutils-x86_64 devel/cloudabi-toolchain

[Ed Schouten]

Author: ed (src committer)
Date: Mon Jul 31 20:26:29 2017
New Revision: 446997
URL: https://svnweb.freebsd.org/changeset/ports/446997

Log:
  Remove CloudABI Binutils tools.
  
  As of FreeBSD 11, the cloudabi-toolchain port uses the ELF-toolchain
  utilities for all the stuff not provided by LLVM. For FreeBSD 10 and
  lower, we still rely on Binutils.
  
  As CloudABI itself is only supported as of FreeBSD 11, there is hardly
  any interest in supporting a Binutils based toolchain. Let's kick out
  the CloudABI Binutils ports and symlink to the utilities in the base
  system unconditionally.
  
  Reviewed by:	rene
  Differential Revision:	https://reviews.freebsd.org/D11733

Deleted:
  head/devel/cloudabi-binutils-aarch64/
  head/devel/cloudabi-binutils-x86_64/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/cloudabi-toolchain/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 31 19:57:58 2017	(r446996)
+++ head/MOVED	Mon Jul 31 20:26:29 2017	(r446997)
@@ -9491,3 +9491,5 @@ games/gondola||2017-07-31|Depends on expired multimedi
 sysutils/flyback||2017-07-31|Unfetchable for more than six months (google code has gone away)
 multimedia/py-ffmpeg||2017-07-31|Has expired: Depreciated upstream in favour of ffpyplayer
 mail/dovecot|mail/dovecot2|2017-07-31|Has expired: Deprecated by upstream years ago. Use mail/dovecot2 instead
+devel/cloudabi-binutils-aarch64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead
+devel/cloudabi-binutils-x86_64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Jul 31 19:57:58 2017	(r446996)
+++ head/devel/Makefile	Mon Jul 31 20:26:29 2017	(r446997)
@@ -305,8 +305,6 @@
     SUBDIR += clisp-hyperspec
     SUBDIR += clojure-cider
     SUBDIR += cloudabi
-    SUBDIR += cloudabi-binutils-aarch64
-    SUBDIR += cloudabi-binutils-x86_64
     SUBDIR += cloudabi-toolchain
     SUBDIR += cltune
     SUBDIR += cmake

Modified: head/devel/cloudabi-toolchain/Makefile
==============================================================================
--- head/devel/cloudabi-toolchain/Makefile	Mon Jul 31 19:57:58 2017	(r446996)
+++ head/devel/cloudabi-toolchain/Makefile	Mon Jul 31 20:26:29 2017	(r446997)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-toolchain
-PORTVERSION=	1.9
+PORTVERSION=	1.10
 CATEGORIES=	devel
 MASTER_SITES=	# None
 DISTFILES=	# None
@@ -16,28 +16,19 @@ RUN_DEPENDS=	clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFF
 		lld${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} \
 		pkgconf:devel/pkgconf
 
+CONFLICTS=	cloudabi-binutils-*
+
 LLVM_SUFFIX=	40
 
 CLOUDABI_ARCHS=	aarch64-unknown-cloudabi armv6-unknown-cloudabi-eabihf \
 		armv7-unknown-cloudabi-eabihf i686-unknown-cloudabi \
 		x86_64-unknown-cloudabi
 
+BASE_TOOLS=	addr2line c++filt objcopy readelf strings strip
 LLVM_TOOLS=	ar nm objdump ranlib size
 SHELL_TOOLS=	man pkg-config
 
 .include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100100
-# Depend on ELF tools provided by the base system. They work well with
-# CloudABI executables.
-BASE_TOOLS=	addr2line c++filt objcopy readelf strings strip
-CONFLICTS=	cloudabi-binutils-*
-.else
-# The tools in the base system are too old to properly support CloudABI
-# and aarch64. Depend on versions provided by GNU Binutils instead.
-RUN_DEPENDS+=	aarch64-unknown-cloudabi-readelf:devel/cloudabi-binutils-aarch64 \
-		x86_64-unknown-cloudabi-readelf:devel/cloudabi-binutils-x86_64
-.endif
 
 .for arch in ${CLOUDABI_ARCHS}
 . for tool in ${BASE_TOOLS} ${LLVM_TOOLS} ${SHELL_TOOLS}