svn commit: r476186 - in head: base/binutils devel/binutils

[John Baldwin]

Author: jhb (src,doc committer)
Date: Wed Aug  1 17:49:33 2018
New Revision: 476186
URL: https://svnweb.freebsd.org/changeset/ports/476186

Log:
  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

Modified:
  head/base/binutils/Makefile
  head/base/binutils/pkg-plist
  head/devel/binutils/Makefile

Modified: head/base/binutils/Makefile
==============================================================================
--- head/base/binutils/Makefile	Wed Aug  1 16:51:31 2018	(r476185)
+++ head/base/binutils/Makefile	Wed Aug  1 17:49:33 2018	(r476186)
@@ -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

Modified: head/base/binutils/pkg-plist
==============================================================================
--- head/base/binutils/pkg-plist	Wed Aug  1 16:51:31 2018	(r476185)
+++ head/base/binutils/pkg-plist	Wed Aug  1 17:49:33 2018	(r476186)
@@ -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

Modified: head/devel/binutils/Makefile
==============================================================================
--- head/devel/binutils/Makefile	Wed Aug  1 16:51:31 2018	(r476185)
+++ head/devel/binutils/Makefile	Wed Aug  1 17:49:33 2018	(r476186)
@@ -145,11 +145,15 @@ post-install:
 	${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz
+	@${RM} -r ${STAGEDIR}${PREFIX}/include
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib
 .endif
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
-	    ${STAGEDIR}${PREFIX}/man/man1/${BUTARGET}-${tool}.1 \
+	    ${STAGEDIR}${PREFIX}/bin/${tool} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${BUTARGET}-${tool}.1 \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${tool}.1 \
 	    ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
 .endfor
 .if defined(BUREMOVE) && ${BUREMOVE:Mld}