Module Name: src
Committed By: mrg
Date: Sun Feb 17 05:29:09 UTC 2019
Modified Files:
src/distrib/sets/lists/comp: md.sparc64
src/etc/mtree: Makefile
Added Files:
src/etc/mtree: NetBSD.compat.mips64 NetBSD.dist.aarch64 NetBSD.dist.arm
NetBSD.dist.ia64 NetBSD.dist.mips NetBSD.dist.powerpc
NetBSD.dist.sh3 NetBSD.dist.sparc NetBSD.dist.sparc64
Removed Files:
src/etc/mtree: NetBSD.compat.mips64eb NetBSD.compat.mips64el
Log Message:
ensure that all include dirs are created before make includes runs.
separate the compat vs per-arch -ness of the mtree lists. merge the
mips64 mtree files into a single file.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.39 -r1.40 src/etc/mtree/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.compat.mips64 \
src/etc/mtree/NetBSD.dist.arm src/etc/mtree/NetBSD.dist.ia64 \
src/etc/mtree/NetBSD.dist.mips src/etc/mtree/NetBSD.dist.powerpc \
src/etc/mtree/NetBSD.dist.sh3 src/etc/mtree/NetBSD.dist.sparc
cvs rdiff -u -r1.1 -r0 src/etc/mtree/NetBSD.compat.mips64eb \
src/etc/mtree/NetBSD.compat.mips64el
cvs rdiff -u -r0 -r1.6 src/etc/mtree/NetBSD.dist.aarch64
cvs rdiff -u -r0 -r1.12 src/etc/mtree/NetBSD.dist.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.207 src/distrib/sets/lists/comp/md.sparc64:1.208
--- src/distrib/sets/lists/comp/md.sparc64:1.207 Thu Feb 14 20:42:40 2019
+++ src/distrib/sets/lists/comp/md.sparc64 Sun Feb 17 05:29:08 2019
@@ -1,7 +1,8 @@
-# $NetBSD: md.sparc64,v 1.207 2019/02/14 20:42:40 christos Exp $
+# $NetBSD: md.sparc64,v 1.208 2019/02/17 05:29:08 mrg Exp $
./usr/include/g++/bits/sparc comp-c-include
+./usr/include/g++/bits/sparc comp-c-include compat
./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc,compat
-./usr/include/g++/bits/sparc64 comp-c-include
+./usr/include/g++/bits/sparc64 comp-c-include compat
./usr/include/g++/bits/sparc64/c++config.h comp-c-include gcc,compat
./usr/include/gcc-4.5/tgmath.h comp-obsolete obsolete
./usr/include/gcc-4.8/tgmath.h comp-obsolete obsolete
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.39 src/etc/mtree/Makefile:1.40
--- src/etc/mtree/Makefile:1.39 Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/Makefile Sun Feb 17 05:29:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/02/09 21:43:23 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2019/02/17 05:29:08 mrg Exp $
.include <bsd.own.mk>
@@ -6,12 +6,15 @@
EXTRA_DIST_FILES= NetBSD.dist.Xorg
.endif
-# XXX these are only used by compat currently, but they could be used
-# by something else; this may need to be fixed properly in the future.
+# Derived from MACHINE_CPU, but keeping 32/64bit for most.
+MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
+
+# The compat specific files
+
.if defined(MKCOMPAT) && ${MKCOMPAT} != "no"
.include "${NETBSDSRCDIR}/compat/archdirs.mk"
-.if exists(NetBSD.compat.${MACHINE_ARCH})
-EXTRA_DIST_FILES+= NetBSD.compat.${MACHINE_ARCH}
+.if exists(NetBSD.compat.${MTREE_MACHINE_ARCH})
+EXTRA_DIST_FILES+= NetBSD.compat.${MTREE_MACHINE_ARCH}
.endif
EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no"
@@ -19,14 +22,32 @@ EXTRA_DIST_FILES+= NetBSD.dist.xcompat #
.endif
.endif
-.if exists(NetBSD.dist.${MACHINE_ARCH})
+
+# Platform specific files.
+# First we grab the mtree-specific, then either the MACHINE_ARCH or
+# MACHINE_CPU files, and finally the MACHINE files, as long as they
+# aren't the same files.
+
+.if exists(NetBSD.dist.${MTREE_MACHINE_ARCH})
+EXTRA_DIST_FILES+= NetBSD.dist.${MTREE_MACHINE_ARCH}
+.endif
+
+.if empty(MTREE_MACHINE_ARCH:M${MACHINE_ARCH}) && \
+ exists(NetBSD.dist.${MACHINE_ARCH})
EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE_ARCH}
+.elif empty(MTREE_MACHINE_ARCH:M${MACHINE_CPU}) && \
+ exists(NetBSD.dist.${MACHINE_CPU})
+EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE_CPU}
.endif
-.if exists(NetBSD.dist.${MACHINE})
+.if empty(MTREE_MACHINE_ARCH:M${MACHINE}) && \
+ exists(NetBSD.dist.${MACHINE})
EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE}
.endif
+
+# The build specific files.
+
.if ${MKATF} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.tests
.if defined(MKCOMPATTESTS) && ${MKCOMPATTESTS} != "no"
Added files:
Index: src/etc/mtree/NetBSD.compat.mips64
diff -u /dev/null src/etc/mtree/NetBSD.compat.mips64:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.compat.mips64 Sun Feb 17 05:29:08 2019
@@ -0,0 +1,5 @@
+# $NetBSD: NetBSD.compat.mips64,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/g++/bits/mips64
+./usr/include/g++/bits/mips32
+./usr/include/g++/bits/mipso32
Index: src/etc/mtree/NetBSD.dist.arm
diff -u /dev/null src/etc/mtree/NetBSD.dist.arm:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.arm Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.arm,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/arm
Index: src/etc/mtree/NetBSD.dist.ia64
diff -u /dev/null src/etc/mtree/NetBSD.dist.ia64:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.ia64 Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.ia64,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/ia64
Index: src/etc/mtree/NetBSD.dist.mips
diff -u /dev/null src/etc/mtree/NetBSD.dist.mips:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.mips Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.mips,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/mips
Index: src/etc/mtree/NetBSD.dist.powerpc
diff -u /dev/null src/etc/mtree/NetBSD.dist.powerpc:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.powerpc Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.powerpc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/powerpc
Index: src/etc/mtree/NetBSD.dist.sh3
diff -u /dev/null src/etc/mtree/NetBSD.dist.sh3:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.sh3 Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.sh3,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/sh3
Index: src/etc/mtree/NetBSD.dist.sparc
diff -u /dev/null src/etc/mtree/NetBSD.dist.sparc:1.1
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.sparc Sun Feb 17 05:29:08 2019
@@ -0,0 +1,4 @@
+# $NetBSD: NetBSD.dist.sparc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/sparc
+./usr/include/sparc64
Index: src/etc/mtree/NetBSD.dist.aarch64
diff -u /dev/null src/etc/mtree/NetBSD.dist.aarch64:1.6
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.aarch64 Sun Feb 17 05:29:08 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.aarch64,v 1.6 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/aarch64
Index: src/etc/mtree/NetBSD.dist.sparc64
diff -u /dev/null src/etc/mtree/NetBSD.dist.sparc64:1.12
--- /dev/null Sun Feb 17 05:29:09 2019
+++ src/etc/mtree/NetBSD.dist.sparc64 Sun Feb 17 05:29:08 2019
@@ -0,0 +1,4 @@
+# $NetBSD: NetBSD.dist.sparc64,v 1.12 2019/02/17 05:29:08 mrg Exp $
+
+./usr/include/sparc
+./usr/include/sparc64
