aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/binutils/Makefile16
-rw-r--r--base/binutils/pkg-plist5
-rw-r--r--devel/binutils/Makefile6
3 files changed, 26 insertions, 1 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
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 676c856dce16..5ea9e0025c4d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -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}