hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-19 14:31:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
01c0757bae
HardenedBSD/bin/sh/Makefile

71 lines
1.8 KiB
Makefile
Raw Normal View History

Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
1996-09-01 12:22:36 +02:00
# @(#)Makefile 8.4 (Berkeley) 5/5/95
$Id$ -> $FreeBSD$
1999-08-28 01:15:48 +02:00
# $FreeBSD$
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
Use src.opts.mk in preference to bsd.own.mk except where we need stuff from the latter.
2014-05-06 06:22:01 +02:00
.include <src.opts.mk>
Migrate tools/regression/bin/ tests to the new layout. This change is a proof of concept on how to easily integrate existing tests from the tools/regression/ hierarchy into the /usr/tests/ test suite and on how to adapt them to the new layout for src. To achieve these goals, this change: - Moves tests from tools/regression/bin/<tool>/ to bin/<tool>/tests/. - Renames the previous regress.sh files to legacy_test.sh. - Adds Makefiles to build and install the tests and all their supporting data files into /usr/tests/bin/. - Plugs the legacy_test test programs into the test suite using the new TAP backend for Kyua (appearing in 0.8) so that the code of the test programs does not have to change. - Registers the new directories in the BSD.test.dist mtree file. Reviewed by: freebsd-testing Approved by: rpaulo (mentor)
2013-12-11 05:09:17 +01:00
Explicitly add unmarked bin/ binaries to the runtime package. Note: tcsh(1) has a MK_TCSH=no test, so this should be a separate package, which requires pre-install/post-install scripts, to be added later. Sponsored by: The FreeBSD Foundation
2016-02-09 17:58:50 +01:00
PACKAGE=runtime
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
PROG= sh
Install /bin/sh safely. This allows a shell script to be used to strip binaries by specifying it in the STRIPBIN environment variable honoured by install(1). MFC after: 3 days
2004-03-18 11:55:47 +01:00
INSTALLFLAGS= -S
sh: Import arithmetic expression code from dash. New features: * proper lazy evaluation of || and && * ?: ternary operator * executable is considerably smaller (8K on i386) because lex and yacc are no longer used Differences from dash: * arith_t instead of intmax_t * imaxdiv() not used * unset or null variables default to 0 * let/exp builtin (undocumented, will probably be removed later) Obtained from: dash
2011-02-09 00:18:06 +01:00
SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \
exec.c expand.c \
sh: Add kill builtin. This allows specifying a %job (which is equivalent to the corresponding process group). Additionally, it improves reliability of kill from sh in high-load situations and ensures "kill" finds the correct utility regardless of PATH, as required by POSIX (unless the undocumented %builtin mechanism is used). Side effect: fatal errors (any error other than kill(2) failure) now return exit status 2 instead of 1. (This is consistent with other sh builtins, but not in NetBSD.) Code size increases about 1K on i386. Obtained from: NetBSD
2010-12-21 23:47:34 +01:00
histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \
sh: Add printf builtin. This was removed in 2001 but I think it is appropriate to add it back: * I do not want to encourage people to write fragile and non-portable echo commands by making printf much slower than echo. * Recent versions of Autoconf use it a lot. * Almost no software still wants to support systems that do not have printf(1) at all. * In many other shells printf is already a builtin. Side effect: printf is now always the builtin version (which behaves identically to /usr/bin/printf) and cannot be overridden via PATH (except via the undocumented %builtin mechanism). Code size increases about 5K on i386. Embedded folks might want to replace /usr/bin/printf with a hard link to /usr/bin/alias.
2010-11-19 13:56:13 +01:00
mystring.c options.c output.c parser.c printf.c redir.c show.c \
Make test(1) a builtin command of our sh(1) for efficiency. The binary size increase is 3,784 bytes (about 0.6%). I don't drop the printf builtin while I'm here because some /etc/rc.* scripts seem to use it before mounting /usr where printf(1) resides. Reviewed by: arch (sheldonh) Inspired by: NetBSD, ksh Clued by: ume (on how the printf builtin is used)
2001-11-17 20:10:11 +01:00
test.c trap.c var.c
sh: Remove mkinit. Replace the RESET blocks with regular functions and a reset() function that calls them all. This code generation tool is unusual and does not appear to provide much benefit. I do not think isolating the knowledge about which modules need to be reset is worth an almost 500-line build tool and wider scope for variables used by the reset functions. Also, relying on reset functions is often wrong: the cleanup should be done in exception handlers so that no stale state remains after 'command eval' and the like.
2013-07-25 17:08:41 +02:00
GENSRCS= builtins.c nodes.c syntax.c
Removed duplicate y.tab.h from SRCS and CLEANFILES.
2004-01-20 14:13:40 +01:00
GENHDRS= builtins.h nodes.h syntax.h token.h
sh: Import arithmetic expression code from dash. New features: * proper lazy evaluation of || and && * ?: ternary operator * executable is considerably smaller (8K on i386) because lex and yacc are no longer used Differences from dash: * arith_t instead of intmax_t * imaxdiv() not used * unset or null variables default to 0 * let/exp builtin (undocumented, will probably be removed later) Obtained from: dash
2011-02-09 00:18:06 +01:00
SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
1996-09-01 12:22:36 +02:00
Improve shell documentation: * Consistently misspell built-in as builtin. * Add a builtin(1) manpage and create builtin(1) MLINKS for all shell builtin commands for which no standalone utility exists. These MLINKS replace those that were created for csh(1). * Add appropriate xrefs for builtin(1) to the csh(1) and sh(1) manpages, as well as to the manpages of standalone utilities which are supported as shell builtin commands in at least one of the shells. In such manpages, explain that similar functionality may be provided as a shell builtin command. * Improve sh(1)'s description of the cd builtin command. Csh(1) already describes it adequately. Replace the cd(1) manpage with a builtin(1) MLINKS link. * Clean up some mdoc problems: use Xr instead of literal "foo(n)"; use Ic instead of Xr for shell builtin commands. * Undo English contractions. Reviewed by: mpp, rgrimes
1999-09-08 17:40:46 +02:00
# MLINKS for Shell built in commands for which there are no userland
# utilities of the same name are handled with the associated manpage,
Whitespace nits.
2006-04-17 19:55:11 +02:00
# builtin.1 in share/man/man1/.
Improve shell documentation: * Consistently misspell built-in as builtin. * Add a builtin(1) manpage and create builtin(1) MLINKS for all shell builtin commands for which no standalone utility exists. These MLINKS replace those that were created for csh(1). * Add appropriate xrefs for builtin(1) to the csh(1) and sh(1) manpages, as well as to the manpages of standalone utilities which are supported as shell builtin commands in at least one of the shells. In such manpages, explain that similar functionality may be provided as a shell builtin command. * Improve sh(1)'s description of the cd builtin command. Csh(1) already describes it adequately. Replace the cd(1) manpage with a builtin(1) MLINKS link. * Clean up some mdoc problems: use Xr instead of literal "foo(n)"; use Ic instead of Xr for shell builtin commands. * Undo English contractions. Reviewed by: mpp, rgrimes
1999-09-08 17:40:46 +02:00
Convert bin/ to LIBADD, reduce overlinking allow to build all components as static
2014-11-25 12:15:40 +01:00
LIBADD= edit
Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
1996-09-01 12:22:36 +02:00
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
CFLAGS+=-DSHELL -I. -I${.CURDIR}
oops, I didn't mean for the unconditional DEBUG code to go in, it's been off in FreeBSD for some time. I realised this a few seconds after the commit started..
1996-09-01 12:27:49 +02:00
# for debug:
In the spirit of r90111, depend on c89 and remove the "STATIC" macro and its usage.
2010-10-14 00:18:03 +02:00
# DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline
Reduce the WARNS level to avoid a compiler warning about a variable possibly being clobbered by a longjmp or a fork with gcc4.
2007-11-18 02:53:07 +01:00
WARNS?= 2
The is_name and is_in_name macros are FUBAR'ed. Due to the use of signed vs. unsigned chars on our various platforms, one gets "warning: comparison is always true due to limited range of data type" from GCC 3.3.
2003-05-02 08:24:51 +02:00
WFORMAT=0
Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
1996-09-01 12:22:36 +02:00
Make test(1) a builtin command of our sh(1) for efficiency. The binary size increase is 3,784 bytes (about 0.6%). I don't drop the printf builtin while I'm here because some /etc/rc.* scripts seem to use it before mounting /usr where printf(1) resides. Reviewed by: arch (sheldonh) Inspired by: NetBSD, ksh Clued by: ume (on how the printf builtin is used)
2001-11-17 20:10:11 +01:00
.PATH: ${.CURDIR}/bltin \
bin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon
2017-03-04 12:31:08 +01:00
${.CURDIR:H}/kill \
${.CURDIR:H}/test \
${SRCTOP}/usr.bin/printf
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
sh: Remove mkinit. Replace the RESET blocks with regular functions and a reset() function that calls them all. This code generation tool is unusual and does not appear to provide much benefit. I do not think isolating the knowledge about which modules need to be reset is worth an almost 500-line build tool and wider scope for variables used by the reset functions. Also, relying on reset functions is often wrong: the cleanup should be done in exception handlers so that no stale state remains after 'command eval' and the like.
2013-07-25 17:08:41 +02:00
CLEANFILES+= mknodes mknodes.o \
Backed out previous backout. Put y.tab.h back in SRCS.
1998-05-06 17:33:59 +02:00
mksyntax mksyntax.o
Changes to support full make parallelism (-j<n>) in the world target. Reviewed by: <many different folks> Submitted by: Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 11:40:24 +02:00
CLEANFILES+= ${GENSRCS} ${GENHDRS}
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
sh: Remove mkinit. Replace the RESET blocks with regular functions and a reset() function that calls them all. This code generation tool is unusual and does not appear to provide much benefit. I do not think isolating the knowledge about which modules need to be reset is worth an almost 500-line build tool and wider scope for variables used by the reset functions. Also, relying on reset functions is often wrong: the cleanup should be done in exception handlers so that no stale state remains after 'command eval' and the like.
2013-07-25 17:08:41 +02:00
build-tools: mknodes mksyntax
Added a `build-tools' target for internal tools. Removed explicit dependencies of foo.o on foo.c. These were mainly placeholders for comments about missing dependencies of tools objects on headers. This problem needs to be handled more generally.
1998-07-07 03:06:58 +02:00
Changes to support full make parallelism (-j<n>) in the world target. Reviewed by: <many different folks> Submitted by: Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 11:40:24 +02:00
.ORDER: builtins.c builtins.h
WITH_META_MODE: Don't expect meta files for side-effect generated files. The first file in these lists will generate everything else so only it should be getting a .meta file. With bmake's missing=yes meta feature these would otherwise cause a rebuild without the .NOMETA hint. Sponsored by: EMC / Isilon Storage Division
2016-06-03 21:25:41 +02:00
builtins.h: .NOMETA
Miscellaneous sorting and addition of rules for object files that depend on generated headers. Reviewed by: Bruce Evans <bde@zeta.org.au>
1997-05-19 02:16:27 +02:00
builtins.c builtins.h: mkbuiltins builtins.def
Work better with how make/bmake works: 1. Avoid a cd back into ${.CURDIR} to run mkbuiltins when we know make will first cd into ${.OBJDIR}. Keep the cwd to what make sets it to. 2. Don't tell mkbuiltins where to write to (= ${.OBJDIR}), but where to get sources from (= ${.CURDIR}). This to compensate for point 1. This fixes a problem with bmake's mk files that optimize ${.OBJDIR} to expand to "." after changing cwd, not taking into account that the target is pretty much undoing that and not getting the full path to the object tree anymore.
2012-05-24 21:48:15 +02:00
sh ${.CURDIR}/mkbuiltins ${.CURDIR}
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
Restored clobbered parts of rev.1.15 (build intermediate object files for tools).
1997-08-25 21:50:01 +02:00
# XXX this is just to stop the default .c rule being used, so that the
# intermediate object has a fixed name.
# XXX we have a default .c rule, but no default .o rule.
META_MODE: Don't rebuild build-tools targets during normal build. This avoids 'build command changed' due to CFLAGS/CC changes during the normal build. Without this the build-tools targets end up rebuilding for the *target* rather than keeping the native versions built in build-tools. Sponsored by: EMC / Isilon Storage Division
2016-04-14 23:06:10 +02:00
mknodes.o mksyntax.o: ${BUILD_TOOLS_META}
Restored clobbered parts of rev.1.15 (build intermediate object files for tools).
1997-08-25 21:50:01 +02:00
${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
META_MODE: Don't rebuild build-tools targets during normal build. This avoids 'build command changed' due to CFLAGS/CC changes during the normal build. Without this the build-tools targets end up rebuilding for the *target* rather than keeping the native versions built in build-tools. Sponsored by: EMC / Isilon Storage Division
2016-04-14 23:06:10 +02:00
mknodes: mknodes.o ${BUILD_TOOLS_META}
mksyntax: mksyntax.o ${BUILD_TOOLS_META}
Restored clobbered parts of rev.1.15 (build intermediate object files for tools).
1997-08-25 21:50:01 +02:00
Changes to support full make parallelism (-j<n>) in the world target. Reviewed by: <many different folks> Submitted by: Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 11:40:24 +02:00
.ORDER: nodes.c nodes.h
WITH_META_MODE: Don't expect meta files for side-effect generated files. The first file in these lists will generate everything else so only it should be getting a .meta file. With bmake's missing=yes meta feature these would otherwise cause a rebuild without the .NOMETA hint. Sponsored by: EMC / Isilon Storage Division
2016-06-03 21:25:41 +02:00
nodes.h: .NOMETA
Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
1996-09-01 12:22:36 +02:00
nodes.c nodes.h: mknodes nodetypes nodes.c.pat
DIRDEPS_BUILD: Run the staged bootstrap-tools version of build-tools. This avoids running target binaries. Sponsored by: EMC / Isilon Storage Division
2016-05-10 00:21:09 +02:00
${BTOOLSPATH:U.}/mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
Changes to support full make parallelism (-j<n>) in the world target. Reviewed by: <many different folks> Submitted by: Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 11:40:24 +02:00
.ORDER: syntax.c syntax.h
WITH_META_MODE: Don't expect meta files for side-effect generated files. The first file in these lists will generate everything else so only it should be getting a .meta file. With bmake's missing=yes meta feature these would otherwise cause a rebuild without the .NOMETA hint. Sponsored by: EMC / Isilon Storage Division
2016-06-03 21:25:41 +02:00
syntax.h: .NOMETA
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
syntax.c syntax.h: mksyntax
DIRDEPS_BUILD: Run the staged bootstrap-tools version of build-tools. This avoids running target binaries. Sponsored by: EMC / Isilon Storage Division
2016-05-10 00:21:09 +02:00
${BTOOLSPATH:U.}/mksyntax
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
Miscellaneous sorting and addition of rules for object files that depend on generated headers. Reviewed by: Bruce Evans <bde@zeta.org.au>
1997-05-19 02:16:27 +02:00
token.h: mktokens
sh ${.CURDIR}/mktokens
BSD 4.4 Lite bin Sources
1994-05-26 08:18:55 +02:00
Add HAS_TESTS to all Makefiles that use the SUBDIR.${MK_TESTS}+= tests idiom
2017-08-02 10:14:06 +02:00
HAS_TESTS=
Convert traditional ${MK_TESTS} conditional idiom for including test directories to SUBDIR.${MK_TESTS} idiom This is being done to pave the way for future work (and homogenity) in ^/projects/make-check-sandbox . No functional change intended. MFC after: 1 weeks
2017-08-02 10:35:51 +02:00
SUBDIR.${MK_TESTS}+= tests
Allow one to regression test 'sh' changes without having to install a potentially bad /bin/sh first.
2010-10-12 20:20:38 +02:00
Miscellaneous sorting and addition of rules for object files that depend on generated headers. Reviewed by: Bruce Evans <bde@zeta.org.au>
1997-05-19 02:16:27 +02:00
.include <bsd.prog.mk>
Reference in New Issue Copy Permalink