svn commit: r476217 - in head: base/binutils devel/binutils
Antoine Brodin
antoine at FreeBSD.org
Thu Aug 2 05:30:19 UTC 2018
Author: antoine
Date: Thu Aug 2 05:30:17 2018
New Revision: 476217
URL: https://svnweb.freebsd.org/changeset/ports/476217
Log:
Revert r476186, it fails to package
With hat: portmgr
Modified:
head/base/binutils/Makefile
head/base/binutils/pkg-plist
head/devel/binutils/Makefile
Modified: head/base/binutils/Makefile
==============================================================================
--- head/base/binutils/Makefile Thu Aug 2 05:06:20 2018 (r476216)
+++ head/base/binutils/Makefile Thu Aug 2 05:30:17 2018 (r476217)
@@ -23,27 +23,11 @@ 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 Thu Aug 2 05:06:20 2018 (r476216)
+++ head/base/binutils/pkg-plist Thu Aug 2 05:30:17 2018 (r476217)
@@ -8,11 +8,6 @@ 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 Thu Aug 2 05:06:20 2018 (r476216)
+++ head/devel/binutils/Makefile Thu Aug 2 05:30:17 2018 (r476217)
@@ -145,15 +145,11 @@ 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}/bin/${tool} \
- ${STAGEDIR}${MANPREFIX}/man/man1/${BUTARGET}-${tool}.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/${tool}.1 \
+ ${STAGEDIR}${PREFIX}/man/man1/${BUTARGET}-${tool}.1 \
${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
.endfor
.if defined(BUREMOVE) && ${BUREMOVE:Mld}
More information about the svn-ports-all
mailing list