Module Name: src
Committed By: apb
Date: Sun Dec 2 12:55:27 UTC 2012
Modified Files:
src/bin/sh: Makefile
src/distrib/cdrom/macppc_installboot: Makefile
src/distrib/cdrom/macppc_mkboothfs: Makefile
src/external/gpl3/gcc/usr.bin: Makefile.inc
src/gnu/usr.bin/gcc4: Makefile.inc
Log Message:
Adjust everything under src (but outside src/tools) to use
the TOOLDIR version of libnbcompat, associated include files,
and associated defs.mk file, instead of the version from the
.OBJDIR of src/tools/compat. This should fix PR 47188.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/bin/sh/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/cdrom/macppc_mkboothfs/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/gcc4/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.98 src/bin/sh/Makefile:1.99
--- src/bin/sh/Makefile:1.98 Tue Aug 23 10:47:06 2011
+++ src/bin/sh/Makefile Sun Dec 2 12:55:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2011/08/23 10:47:06 christos Exp $
+# $NetBSD: Makefile,v 1.99 2012/12/02 12:55:27 apb Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include <bsd.own.mk>
@@ -74,8 +74,7 @@ nodes.c nodes.h: mknodes.sh nodetypes no
[ -f nodes.h ]
.if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB= -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat
.endif
.if make(install)
Index: src/distrib/cdrom/macppc_installboot/Makefile
diff -u src/distrib/cdrom/macppc_installboot/Makefile:1.8 src/distrib/cdrom/macppc_installboot/Makefile:1.9
--- src/distrib/cdrom/macppc_installboot/Makefile:1.8 Wed Mar 25 15:26:49 2009
+++ src/distrib/cdrom/macppc_installboot/Makefile Sun Dec 2 12:55:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/03/25 15:26:49 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2012/12/02 12:55:27 apb Exp $
HOSTPROG= macppc_installboot
SRCS= installboot.c cd9660.c cd9660_util.c
@@ -24,9 +24,7 @@ cleaninc:
.include <bsd.own.mk>
.ifndef NOCOMPATLIB
-COMPATOBJ!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-.-include "${COMPATOBJ}/defs.mk"
-HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/tools/compat
+.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
.include <bsd.hostprog.mk>
Index: src/distrib/cdrom/macppc_mkboothfs/Makefile
diff -u src/distrib/cdrom/macppc_mkboothfs/Makefile:1.4 src/distrib/cdrom/macppc_mkboothfs/Makefile:1.5
--- src/distrib/cdrom/macppc_mkboothfs/Makefile:1.4 Mon Mar 30 11:22:46 2009
+++ src/distrib/cdrom/macppc_mkboothfs/Makefile Sun Dec 2 12:55:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/03/30 11:22:46 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2012/12/02 12:55:27 apb Exp $
HOSTPROG= macppc_mkboothfs
SRCS= mkboothfs.c
@@ -9,9 +9,7 @@ CLEANFILES+= boothfs
.include <bsd.own.mk>
.ifndef NOCOMPATLIB
-COMPATOBJ!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-.-include "${COMPATOBJ}/defs.mk"
-HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/tools/compat
+.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.11 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.12
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.11 Tue Sep 18 07:05:15 2012
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sun Dec 2 12:55:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2012/09/18 07:05:15 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.12 2012/12/02 12:55:27 apb Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -24,8 +24,7 @@ CPPFLAGS+= -I.
DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h
.if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB= -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat
.endif
GNUHOSTDIST= ${DIST}
Index: src/gnu/usr.bin/gcc4/Makefile.inc
diff -u src/gnu/usr.bin/gcc4/Makefile.inc:1.5 src/gnu/usr.bin/gcc4/Makefile.inc:1.6
--- src/gnu/usr.bin/gcc4/Makefile.inc:1.5 Mon May 30 14:41:26 2011
+++ src/gnu/usr.bin/gcc4/Makefile.inc Sun Dec 2 12:55:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/05/30 14:41:26 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2012/12/02 12:55:27 apb Exp $
.include <bsd.own.mk>
@@ -11,8 +11,7 @@ CPPFLAGS+= -DLOCALEDIR=\"/usr/share/loca
HOST_CPPFLAGS+= -I${.CURDIR}/..
.if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB= -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat
.endif
GNUHOSTDIST= ${DIST}
