libbinutils.a needs basename(3); when the latter is provided

by -legacy, liblegacy.a should come last in the LDADD list.

12 files changed, 48 insertions, 36 deletions

diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 6988857..416c8fe 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -9,9 +9,10 @@ SRCS=	addr2line.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index d1e6493..8faeb8a4 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -10,9 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index ccd94ab..5c2d770 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -20,9 +20,10 @@ CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
 CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOSHARED?=	yes
-DPADD=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
-DPADD+=	${RELTOP}/libopcodes/libopcodes.a
+DPADD:=	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${RELTOP}/libopcodes/libopcodes.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 036cacb..9b55fd1 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -15,8 +15,9 @@ CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 CLEANDIRS+=	ldscripts
 CLEANFILES+=	ldemul-list.h stringify.sed
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index ef2f2d6..a98d92b 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -10,9 +10,10 @@ WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index dfa04f5..98f4b0c 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -9,9 +9,10 @@ SRCS=	objcopy.c not-strip.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 4a1d6a3..2db70f3 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -10,10 +10,11 @@ WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libopcodes/libopcodes.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libopcodes/libopcodes.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index 960b130..2420e58 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -10,9 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 9601246..7140826 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -12,9 +12,10 @@ SRCS=	${PROG}.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index a0ef3171..b502c47 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -9,9 +9,10 @@ SRCS=	size.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 346e59f..0da55c4 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -9,9 +9,10 @@ SRCS=	strings.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index c059b4b..693e13b 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -9,9 +9,10 @@ SRCS=	objcopy.c is-strip.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD=	${RELTOP}/libbinutils/libbinutils.a
-DPADD+=	${RELTOP}/libbfd/libbfd.a
-DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
+	${RELTOP}/libbfd/libbfd.a \
+	${RELTOP}/libiberty/libiberty.a \
+	${DPADD}
 LDADD=	${DPADD}
 CLEANFILES+=	maybe_stripped