Module Name: src
Committed By: msaitoh
Date: Thu Jun 4 07:35:25 UTC 2015
Modified Files:
src/bin/sh [netbsd-7]: Makefile builtins.def
Log Message:
Pull up following revision(s) (requested by martin in ticket #821):
bin/sh/builtins.def: revision 1.23
bin/sh/Makefile: revision 1.101
Include printf by default even for SMALL builds. It is used e.g. by
dhcpcd and as such required by most ramdisk images. Allow turning it off
again by TINYPROG.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.100.2.1 src/bin/sh/Makefile
cvs rdiff -u -r1.22 -r1.22.10.1 src/bin/sh/builtins.def
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.100 src/bin/sh/Makefile:1.100.2.1
--- src/bin/sh/Makefile:1.100 Sat Jul 5 23:13:41 2014
+++ src/bin/sh/Makefile Thu Jun 4 07:35:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2014/07/05 23:13:41 dholland Exp $
+# $NetBSD: Makefile,v 1.100.2.1 2015/06/04 07:35:25 msaitoh Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include <bsd.own.mk>
@@ -42,6 +42,9 @@ CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
.ifdef SMALLPROG
CPPFLAGS+=-DSMALL
+.endif
+.ifdef TINYPROG
+CPPFLAGS+=-DTINY
.else
SRCS+=printf.c
.endif
Index: src/bin/sh/builtins.def
diff -u src/bin/sh/builtins.def:1.22 src/bin/sh/builtins.def:1.22.10.1
--- src/bin/sh/builtins.def:1.22 Mon Dec 31 14:10:15 2012
+++ src/bin/sh/builtins.def Thu Jun 4 07:35:25 2015
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: builtins.def,v 1.22 2012/12/31 14:10:15 dsl Exp $
+# $NetBSD: builtins.def,v 1.22.10.1 2015/06/04 07:35:25 msaitoh Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -66,7 +66,7 @@ hashcmd hash
jobidcmd jobid
jobscmd -u jobs
localcmd local
-#ifndef SMALL
+#ifndef TINY
printfcmd printf
#endif
pwdcmd -u pwd
