Module Name: src
Committed By: matt
Date: Thu Feb 14 00:53:31 UTC 2013
Modified Files:
src/external/gpl3/binutils/usr.bin/common: Makefile.prog
src/external/gpl3/binutils/usr.bin/gas: Makefile
src/external/gpl3/binutils/usr.bin/gprof: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
Log Message:
Deal with MKPICLIB=no fallout
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/usr.bin/gprof/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.1 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.2
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.1 Tue Aug 18 20:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Thu Feb 14 00:53:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.1 2009/08/18 20:22:08 skrll Exp $
+# $NetBSD: Makefile.prog,v 1.2 2013/02/14 00:53:30 matt Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -28,6 +28,8 @@ OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libo
LDADD+= -L${OPCODESOBJ} -lopcodes
.if ${MKPICLIB} != "no"
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
+.elif ${MKPIC} != "no"
+DPADD+= ${OPCODESOBJ}/libopcodes.so
.else
DPADD+= ${OPCODESOBJ}/libopcodes.a
.endif
@@ -38,6 +40,8 @@ BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd &
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
Index: src/external/gpl3/binutils/usr.bin/gas/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gas/Makefile:1.4 src/external/gpl3/binutils/usr.bin/gas/Makefile:1.5
--- src/external/gpl3/binutils/usr.bin/gas/Makefile:1.4 Tue Nov 10 10:24:50 2009
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile Thu Feb 14 00:53:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/10 10:24:50 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/14 00:53:30 matt Exp $
.include <bsd.own.mk>
@@ -31,6 +31,8 @@ OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libo
LDADD+= -L${OPCODESOBJ} -lopcodes
.if ${MKPICLIB} != "no"
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
+.elif ${MKPIC} != "no"
+DPADD+= ${OPCODESOBJ}/libopcodes.so
.else
DPADD+= ${OPCODESOBJ}/libopcodes.a
.endif
@@ -39,6 +41,8 @@ BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd &
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
Index: src/external/gpl3/binutils/usr.bin/gprof/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.5 src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.6
--- src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.5 Tue Nov 10 10:24:50 2009
+++ src/external/gpl3/binutils/usr.bin/gprof/Makefile Thu Feb 14 00:53:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/11/10 10:24:50 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/14 00:53:30 matt Exp $
.include <bsd.own.mk>
@@ -18,6 +18,8 @@ BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd &
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
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.11 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.12
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.11 Sun Sep 25 04:32:47 2011
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Thu Feb 14 00:53:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/09/25 04:32:47 christos Exp $
+# $NetBSD: Makefile,v 1.12 2013/02/14 00:53:30 matt Exp $
.include <bsd.own.mk>
@@ -29,6 +29,8 @@ BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd &
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
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.2 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.3
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.2 Tue Sep 8 07:08:02 2009
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Thu Feb 14 00:53:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
.include <bsd.own.mk>
@@ -16,6 +16,8 @@ CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I$
.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
DPADD+= ${BFDDIR}/libbfd_pic.a
+.elif !defined(HOSTPROG) && ${MKPIC} != "no"
+DPADD+= ${BFDDIR}/libbfd.so
.else
DPADD+= ${BFDDIR}/libbfd.a
.endif
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.2 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.3
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.2 Tue Sep 8 07:08:02 2009
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Thu Feb 14 00:53:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
.include <bsd.own.mk>
@@ -16,6 +16,8 @@ CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I$
.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
DPADD+= ${BFDDIR}/libbfd_pic.a
+.elif !defined(HOSTPROG) && ${MKPIC} != "no"
+DPADD+= ${BFDDIR}/libbfd.so
.else
DPADD+= ${BFDDIR}/libbfd.a
.endif
