aboutsummaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2018-08-02 01:49:33 +0800
committerjhb <jhb@FreeBSD.org>2018-08-02 01:49:33 +0800
commit52d6642dda85913ac0a0612bf5f05f645a825b3c (patch)
tree19e509051a922545312aec6ee277b655860e2829 /base
parent7d168237506cf275f9375cca1784935202ed2ab0 (diff)
downloadfreebsd-ports-gnome-52d6642dda85913ac0a0612bf5f05f645a825b3c.tar.gz
freebsd-ports-gnome-52d6642dda85913ac0a0612bf5f05f645a825b3c.tar.zst
freebsd-ports-gnome-52d6642dda85913ac0a0612bf5f05f645a825b3c.zip
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
Diffstat (limited to 'base')
-rw-r--r--base/binutils/Makefile16
-rw-r--r--base/binutils/pkg-plist5
2 files changed, 21 insertions, 0 deletions
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