Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external Deal with MKPICLIB=no fallout
details: https://anonhg.NetBSD.org/src/rev/d7787918e6e3
branches: trunk
changeset: 784911:d7787918e6e3
user: matt <matt%NetBSD.org@localhost>
date: Thu Feb 14 00:53:30 2013 +0000
description:
Deal with MKPICLIB=no fallout
diffstat:
external/bsd/am-utils/Makefile.inc | 10 ++++++----
external/gpl3/binutils/usr.bin/common/Makefile.prog | 6 +++++-
external/gpl3/binutils/usr.bin/gas/Makefile | 6 +++++-
external/gpl3/binutils/usr.bin/gprof/Makefile | 4 +++-
external/gpl3/binutils/usr.bin/ld/Makefile | 4 +++-
external/gpl3/binutils/usr.sbin/dbsym/Makefile | 4 +++-
external/gpl3/binutils/usr.sbin/mdsetimage/Makefile | 4 +++-
7 files changed, 28 insertions(+), 10 deletions(-)
diffs (150 lines):
diff -r 81eeb229e5b4 -r d7787918e6e3 external/bsd/am-utils/Makefile.inc
--- a/external/bsd/am-utils/Makefile.inc Thu Feb 14 00:52:03 2013 +0000
+++ b/external/bsd/am-utils/Makefile.inc Thu Feb 14 00:53:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2008/09/20 10:45:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/02/14 00:54:12 matt Exp $
WARNS?= 1
@@ -28,9 +28,11 @@
.if !defined(LIB) || empty(LIB)
LDADD+= -L${LIBAMUOBJDIR} -lamu
-.if ${MKPICLIB} == "no"
+.if ${MKPICLIB} != "no"
+DPADD+= ${LIBAMUOBJDIR}/libamu_pic.a
+.elif ${MKPIC} != "no"
+DPADD+= ${LIBAMUOBJDIR}/libamu.so
+.else
DPADD+= ${LIBAMUOBJDIR}/libamu.a
-.else
-DPADD+= ${LIBAMUOBJDIR}/libamu_pic.a
.endif
.endif
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
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 @@
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
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
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 @@
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
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.bin/gprof/Makefile
--- a/external/gpl3/binutils/usr.bin/gprof/Makefile Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gprof/Makefile Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
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
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
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
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.sbin/dbsym/Makefile
--- a/external/gpl3/binutils/usr.sbin/dbsym/Makefile Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/dbsym/Makefile Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
.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
diff -r 81eeb229e5b4 -r d7787918e6e3 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Thu Feb 14 00:52:03 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Thu Feb 14 00:53:30 2013 +0000
@@ -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 @@
.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
Home |
Main Index |
Thread Index |
Old Index