[src/trunk]: src/external/gpl3/binutils re-order library dependencies to make...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b1d3e2860ca
branches:  trunk
changeset: 784946:6b1d3e2860ca
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 14 21:29:35 2013 +0000

description:
re-order library dependencies to make sure that -lintl and -lz are after
the rest of the libraries so that static linking works.

diffstat:

 external/gpl3/binutils/usr.bin/Makefile.inc         |   5 +---
 external/gpl3/binutils/usr.bin/common/Makefile.prog |  14 ++++++------
 external/gpl3/binutils/usr.bin/gas/Makefile         |  14 ++++++------
 external/gpl3/binutils/usr.bin/gprof/Makefile       |  23 +++++---------------
 external/gpl3/binutils/usr.bin/ld/Makefile          |  12 +++++-----
 external/gpl3/binutils/usr.bin/readelf/Makefile     |   5 +---
 external/gpl3/binutils/usr.sbin/dbsym/Makefile      |  12 +++++++---
 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile |  10 +++++---
 8 files changed, 42 insertions(+), 53 deletions(-)

diffs (251 lines):

diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/Makefile.inc       Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile.inc       Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2011/05/30 14:41:26 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2013/02/14 21:29:35 christos Exp $
 
 BINDIR?=       /usr/bin
 
@@ -13,9 +13,6 @@
                -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} \
                -I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
                -DLOCALEDIR=\"${LOCALEDIR}\"
-LDADD+=-lz
-DPADD+=${LIBZ}
-
 NOGCCERROR=    # defined
 
 .endif # __MAKEFILE_INC_INCLUDED__
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.prog,v 1.5 2013/02/14 03:36:44 christos Exp $
+#      $NetBSD: Makefile.prog,v 1.6 2013/02/14 21:29:35 christos Exp $
 #
 # Common Makefile fragment for a binutils program.
 #
@@ -20,24 +20,24 @@
 
 CPPFLAGS+=     -I${.CURDIR}/../common/arch/${MACHINE_ARCH}
 
-LDADD+=                -lintl
-DPADD+=                ${LIBINTL}
-
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
-PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
+PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
-PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
-PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 .endif
 
 .PATH: ${DIST}/binutils ${DIST}/binutils/doc
 
 .include <bsd.prog.mk>
 
+LDADD+=                -lintl -lz
+DPADD+=                ${LIBINTL} ${LIBZ}
+
 # Override the .y.c and .y.l rules *after* <bsd.prog.mk>
 .y.c .l.c:
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2013/02/14 03:36:44 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2013/02/14 21:29:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -24,12 +24,9 @@
 CPPFLAGS+=     -I${DIST}/gas -I${DIST}/gas/config
 CPPFLAGS+=     -I${DIST}
 
-PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
-PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
-
-LDADD=         -lintl
-DPADD=         ${LIBINTL}
+PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 
 TEXINFO=       as.texinfo
 COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
@@ -41,3 +38,6 @@
 
 .include <bsd.prog.mk>
 .include <bsd.info.mk>
+
+LDADD+=                -lintl -lz
+DPADD+=                ${LIBINTL} ${LIBZ}
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/gprof/Makefile
--- a/external/gpl3/binutils/usr.bin/gprof/Makefile     Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gprof/Makefile     Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/02/14 00:53:30 matt Exp $
+#      $NetBSD: Makefile,v 1.7 2013/02/14 21:29:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -11,22 +11,8 @@
 SRCS=          ${G_gprof_OBJECTS:.o=.c}
 CPPFLAGS+=     -I${.CURDIR}/arch/${MACHINE_ARCH}
 
-LDADD=         -lintl
-DPADD=         ${LIBINTL}
-
-BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-LDADD+=                -L${BFDOBJ} -lbfd
-.if ${MKPICLIB} != "no"
-DPADD+=                ${BFDOBJ}/libbfd_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${BFDOBJ}/libbfd.so
-.else
-DPADD+=                ${BFDOBJ}/libbfd.a
-.endif
-
-IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-LDADD+=                -L${IBERTYOBJ} -liberty
-DPADD+=                ${IBERTYOBJ}/libiberty.a
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 
 TEXINFO=       ${G_TEXINFOS}
 COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
@@ -38,3 +24,6 @@
 
 .include <bsd.prog.mk>
 .include <bsd.info.mk>
+
+LDADD+=        -lintl -lz
+DPADD+=        ${LIBINTL} ${LIBZ}
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2013/02/14 03:36:44 christos Exp $
+#      $NetBSD: Makefile,v 1.16 2013/02/14 21:29:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -20,13 +20,10 @@
                -DTOOLBINDIR=\"/usr/bin\" \
                -DENABLE_PLUGINS
 
-LDADD=         -lintl
-DPADD=         ${LIBINTL}
-
 COPTS.ldgram.c = -Wno-stack-protector
 
-PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 
 TEXINFO=       ${G_TEXINFOS}
 COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
@@ -124,3 +121,6 @@
 cleanprog: __cleanldscripts 
 __cleanldscripts:
        -rm -rf ldscripts tmpdir
+
+LDADD+=                -lintl -lz
+DPADD+=                ${LIBINTL} ${LIBZ}
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.bin/readelf/Makefile
--- a/external/gpl3/binutils/usr.bin/readelf/Makefile   Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/readelf/Makefile   Thu Feb 14 21:29:35 2013 +0000
@@ -1,10 +1,7 @@
-#      $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+#      $NetBSD: Makefile,v 1.2 2013/02/14 21:29:36 christos Exp $
 
 PROG=          readelf
 
-DPADD=         ${LIBZ}
-LDADD=         -lz
-
 .include <bsd.own.mk>
 
 .include "${.CURDIR}/../common/Makefile.prog"
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.sbin/dbsym/Makefile
--- a/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/02/14 03:36:44 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2013/02/14 21:29:36 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,8 @@
 CPPFLAGS+=     -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
 .if !defined(HOSTPROG)
-PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 .else
 CPPFLAGS+=     -I${BFDDIR}
 DPADD+=                ${BFDDIR}/libbfd.a
@@ -25,6 +25,8 @@
 LDADD+=                -L${IBERTYDIR} -liberty
 .endif
 
+.include <bsd.prog.mk>
+
 .ifndef HOSTPROG
 .include       "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
 CPPFLAGS+=     -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
@@ -33,4 +35,6 @@
 .endif # HOSTPROG
 .endif # MKBINUTILS != no
 
-.include <bsd.prog.mk>
+
+LDADD+=                -lz
+DPADD+=                ${LIBZ}
diff -r 9079bfdf3f11 -r 6b1d3e2860ca external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 21:07:25 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 21:29:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/02/14 03:36:44 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2013/02/14 21:29:36 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,8 @@
 CPPFLAGS+=     -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
 .if !defined(HOSTPROG)
-PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
+PROGDPLIBS+=   bfd     ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty  ${TOP}/${BFDSUBDIR}/libiberty
 .else
 DPADD+=                ${BFDDIR}/libbfd.a
 LDADD+=                -L${BFDDIR} -lbfd
@@ -25,6 +25,7 @@
 CPPFLAGS+=     -I${BFDDIR}
 .endif
 
+.include <bsd.prog.mk>
 
 .ifndef HOSTPROG
 .include       "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
@@ -35,4 +36,5 @@
 .endif # HOSTPROG
 .endif # MKBINUTILS != no
 
-.include <bsd.prog.mk>
+LDADD+=                -lz
+DPADD+=                ${LIBZ}