Date: Mon, 20 Aug 2018 09:17:46 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477638 - in head: base/binutils devel/binutils Message-ID: <201808200917.w7K9HkmY037160@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb (src,doc committer) Date: Mon Aug 20 09:17:45 2018 New Revision: 477638 URL: https://svnweb.freebsd.org/changeset/ports/477638 Log: 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. - Drop plist entries from devel/binutils that are now properly removed. Previously the binaries for Windows tools like dlltool were removed from the staging area but the manpages were still left in the package. - Bump PORTREVISION. This is a recommit of r476186 but with the update to the pkg-plist of devel/binutils and PORTREVISION bump. PR: 230278 Reviewed by: antoine Differential Revision: https://reviews.freebsd.org/D16582 Modified: head/base/binutils/Makefile head/base/binutils/pkg-plist head/devel/binutils/Makefile head/devel/binutils/pkg-plist Modified: head/base/binutils/Makefile ============================================================================== --- head/base/binutils/Makefile Mon Aug 20 09:08:08 2018 (r477637) +++ head/base/binutils/Makefile Mon Aug 20 09:17:45 2018 (r477638) @@ -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 Mon Aug 20 09:08:08 2018 (r477637) +++ head/base/binutils/pkg-plist Mon Aug 20 09:17:45 2018 (r477638) @@ -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 Mon Aug 20 09:08:08 2018 (r477637) +++ head/devel/binutils/Makefile Mon Aug 20 09:17:45 2018 (r477638) @@ -3,7 +3,7 @@ PORTNAME= binutils PORTVERSION= 2.30 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases @@ -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} Modified: head/devel/binutils/pkg-plist ============================================================================== --- head/devel/binutils/pkg-plist Mon Aug 20 09:08:08 2018 (r477637) +++ head/devel/binutils/pkg-plist Mon Aug 20 09:17:45 2018 (r477638) @@ -28,10 +28,8 @@ man/man1/ar.1.gz man/man1/as.1.gz man/man1/c++filt.1.gz man/man1/gprof.1.gz -man/man1/dlltool.1.gz man/man1/elfedit.1.gz man/man1/ld.1.gz -man/man1/nlmconv.1.gz man/man1/nm.1.gz man/man1/objcopy.1.gz man/man1/objdump.1.gz @@ -40,8 +38,6 @@ man/man1/readelf.1.gz man/man1/size.1.gz man/man1/strings.1.gz man/man1/strip.1.gz -man/man1/windmc.1.gz -man/man1/windres.1.gz %%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo %%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo %%NLS%%share/locale/bg/LC_MESSAGES/ld.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808200917.w7K9HkmY037160>