From a96913f0c34ec8b9db46cc98440ab7fcf1d0645a Mon Sep 17 00:00:00 2001 From: YONETANI Tomokazu Date: Thu, 4 Jan 2007 14:19:03 +0000 Subject: [PATCH] uname(1) is still used in a few places during buildworld, put it back as a boot strap tool. Submitted-by: sephe@ --- Makefile.inc1 | 4 ++-- usr.bin/uname/uname.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8f19564843..ef746aae88 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.97 2007/01/01 19:59:25 swildner Exp $ +# $DragonFly: src/Makefile.inc1,v 1.98 2007/01/04 14:19:03 y0netan1 Exp $ # # Build-time options are documented in make.conf(5). # @@ -769,7 +769,7 @@ bootstrap-tools: bin/hostname bin/kill \ usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \ usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk usr.bin/stat \ - usr.bin/find usr.bin/lex usr.bin/sed usr.bin/touch \ + usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \ usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \ usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \ usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \ diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index 7dc1c5ddbe..d676f47110 100644 --- a/usr.bin/uname/uname.c +++ b/usr.bin/uname/uname.c @@ -34,7 +34,7 @@ * @(#) Copyright (c) 1993 The Regents of the University of California. All rights reserved. * @(#)uname.c 8.2 (Berkeley) 5/4/95 * $FreeBSD: src/usr.bin/uname/uname.c,v 1.4.6.2 2002/10/17 07:47:29 jmallett Exp $ - * $DragonFly: src/usr.bin/uname/uname.c,v 1.4 2006/12/26 11:27:44 sephe Exp $ + * $DragonFly: src/usr.bin/uname/uname.c,v 1.5 2007/01/04 14:19:03 y0netan1 Exp $ */ #include @@ -45,6 +45,10 @@ #include #include +#ifndef HW_MACHINE_UNAME +#define HW_MACHINE_UNAME HW_MACHINE +#endif + #define MFLAG 0x01 #define NFLAG 0x02 #define PFLAG 0x04 -- 2.11.4.GIT