From 40583ab0316f3bdac6ecb17b5595000a6de9d007 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 1 Aug 2018 17:49:33 +0000
Subject: base/binutils: Cleanup packing lists.

- Use BUREMOVE to strip binutils tools not installed by the base/binutils
  package.
- Update BUREMOVE logic in devel/binutils to cope with the base package
  which installs tools without a BUTARGET- prefix.
- Use MANPREFIX for BUREMOVE to handle the PREFIX=/usr case used by
  base/binutils.
- Remove binutils headers and libraries explicitly from the staging area
  for base/binutils.
- Add missing plist entries for binutils binaries installed under a
  BUTARGET subdirectory.

Approved by:	bapt (implicit for base/*)
Differential Revision:	https://reviews.freebsd.org/D16464
---
 base/binutils/Makefile  | 16 ++++++++++++++++
 base/binutils/pkg-plist |  5 +++++
 2 files changed, 21 insertions(+)

(limited to 'base')

diff --git a/base/binutils/Makefile b/base/binutils/Makefile
index 7eb28ee8ac0a..8e1b175504c9 100644
--- a/base/binutils/Makefile
+++ b/base/binutils/Makefile
@@ -23,11 +23,27 @@ BUTARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 CONFIGURE_ARGS+=	--disable-host-shared
 PREFIX=	/usr
+BUREMOVE=	addr2line \
+		ar \
+		c++filt \
+		dlltool \
+		elfedit \
+		gprof \
+		nlmconv \
+		nm \
+		ranlib \
+		readelf \
+		size \
+		strings \
+		strip \
+		windmc \
+		windres
 
 .include "${MASTERDIR}/Makefile"
 
 .if ${OSVERSION} >= 1100100
 PLIST_SUB+=	OBJCOPY="@comment "
+BUREMOVE+=	objcopy
 .else
 PLIST_SUB+=	OBJCOPY=""
 .endif
diff --git a/base/binutils/pkg-plist b/base/binutils/pkg-plist
index 513e305b247e..39a589afdf3c 100644
--- a/base/binutils/pkg-plist
+++ b/base/binutils/pkg-plist
@@ -8,6 +8,11 @@ bin/%%BUTARGET%%-ld
 bin/%%BUTARGET%%-ld.bfd
 %%OBJCOPY%%bin/%%BUTARGET%%-objcopy
 bin/%%BUTARGET%%-objdump
+%%BUTARGET%%/bin/as
+%%BUTARGET%%/bin/ld
+%%BUTARGET%%/bin/ld.bfd
+%%OBJCOPY%%%%BUTARGET%%/bin/objcopy
+%%BUTARGET%%/bin/objdump
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.x
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xc
-- 
cgit v1.2.3