JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
95a2c63096
mksh/Makefile

109 lines
4.0 KiB
Makefile
Raw Normal View History

• implement fcntl(2)-based advisory locking as an alternative iff flock(2) is not found, from a suggestion by RT (LP: #912691) • try harder (in a loop) to acquire a file lock if the locking mechanism documents EINTR is a possibility (fcntl always, flock on Linux not .Ox) • use -std=c99 not -std=gnu99 if it must be at all
2012-03-28 00:36:53 +02:00
# $MirOS: src/bin/mksh/Makefile,v 1.95 2012/03/27 22:36:49 tg Exp $
• sync distrib/special/mksh/Makefile with bin/mksh/Build.sh and fix the regression test’s results while here, which have been broken since cid 10049D9BE5254CE65B8 • get rid of separate copyright file which was intended for De- bian; track down commits in all files of oksh-mirbsd and mksh to get correct copyright years per-file, as is BSD custom
2009-05-16 18:59:42 +02:00
#-
• implement fcntl(2)-based advisory locking as an alternative iff flock(2) is not found, from a suggestion by RT (LP: #912691) • try harder (in a loop) to acquire a file lock if the locking mechanism documents EINTR is a possibility (fcntl always, flock on Linux not .Ox) • use -std=c99 not -std=gnu99 if it must be at all
2012-03-28 00:36:53 +02:00
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012
• sync distrib/special/mksh/Makefile with bin/mksh/Build.sh and fix the regression test’s results while here, which have been broken since cid 10049D9BE5254CE65B8 • get rid of separate copyright file which was intended for De- bian; track down commits in all files of oksh-mirbsd and mksh to get correct copyright years per-file, as is BSD custom
2009-05-16 18:59:42 +02:00
# Thorsten Glaser <tg@mirbsd.org>
#
# Provided that these terms and disclaimer and all copyright notices
# are retained or reproduced in an accompanying document, permission
# is granted to deal in this work without restriction, including un-
# limited rights to use, publicly perform, distribute, sell, modify,
# merge, give away, or sublicence.
#
# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
# the utmost extent permitted by applicable law, neither express nor
# implied; without malicious intent or gross negligence. In no event
# may a licensor, author or contributor be held liable for indirect,
# direct, other damage, loss, or other issues arising in any way out
# of dealing in the work, even if advised of the possibility of such
# damage or existence of a defect, except proven that it results out
# of said person's immediate fault when using the work as intended.
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
#-
# use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff
• embed MKSH_ASSUME_UTF8 and MKSH_NEED_MKNOD in Build.sh • have mksh with BSD makefiles always enable MKSH_ASSUME_UTF8 • sync BSD makefiles with Build.sh output
2007-02-18 17:24:13 +01:00
.include <bsd.own.mk>
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
PROG= mksh
remove espie's double-linked-list based allocator and write a similarily simple one from scratch, which however performs better than espie's with AFREE_DEBUG enabled which took away the benefit of the double-linked-list approach all of (core) mksh is now MirOS licenced
2009-03-22 17:55:38 +01:00
SRCS= edit.c eval.c exec.c expr.c funcs.c histrap.c jobs.c \
lalloc.c lex.c main.c misc.c shf.c syn.c tree.c var.c
* new target 'test-build' to easily check Build.sh operation from mbsd * regen CPPFLAGS+= stuff with 'test-build'
2007-01-18 02:24:46 +01:00
.if !make(test-build)
disable deprecated code on MirBSD-current mksh-current (note: next to deprecate is support for parsing $((010)) as octal, which is agreed gecko2@ tonight at the Jugo already)
2011-12-08 23:19:16 +01:00
CPPFLAGS+= -DMKSH_ASSUME_UTF8 -DMKSH_DISABLE_DEPRECATED \
re-vamp __attribute__ handling; let this pass on HP-UX bundled compiler as well as HP aCC
2009-12-12 23:27:10 +01:00
-DHAVE_ATTRIBUTE_BOUNDED=1 -DHAVE_ATTRIBUTE_FORMAT=1 \
-DHAVE_ATTRIBUTE_NONNULL=1 -DHAVE_ATTRIBUTE_NORETURN=1 \
-DHAVE_ATTRIBUTE_UNUSED=1 -DHAVE_ATTRIBUTE_USED=1 \
• more comment and int→bool cleanup, add and improve some comments • in interactive mode, always look up {LC_{ALL,CTYPE},LANG} environment variables if setlocale/nl_langinfo(CODESET) doesn’t suffice • add the ability to call any builtin (some don't make sense or wouldn't work) directly by analysing argv[0] • for direct builtin calls, the {LC_{ALL,CTYPE},LANG} environment variables determine utf8-mode, even if MKSH_ASSUME_UTF8 was set • when called as builtin, echo behaves POSIXish • add domainname as alias for true on MirBSD only, to be able to link it • sync mksh Makefiles with Build.sh output • adjust manpage wrt release plans • link some things to mksh now that we have callable builtins: bin/echo bin/kill bin/pwd bin/sleep (exact matches) bin/test bin/[ (were scripts before) bin/domainname=usr/bin/true usr/bin/false (move to /bin/ now) • drop linked utilities and, except for echo and kill, their manpages • adjust instbin and link a few more there as well
2011-02-11 02:18:23 +01:00
-DHAVE_SYS_BSDTYPES_H=0 -DHAVE_SYS_FILE_H=1 \
sync… various things
2011-04-09 20:47:14 +02:00
-DHAVE_SYS_MKDEV_H=0 -DHAVE_SYS_MMAN_H=1 -DHAVE_SYS_PARAM_H=1 \
-DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSMACROS_H=0 \
-DHAVE_BSTRING_H=0 -DHAVE_GRP_H=1 -DHAVE_LIBGEN_H=1 \
-DHAVE_LIBUTIL_H=0 -DHAVE_PATHS_H=1 -DHAVE_STDINT_H=1 \
-DHAVE_STRINGS_H=1 -DHAVE_ULIMIT_H=0 -DHAVE_VALUES_H=0 \
-DHAVE_CAN_INTTYPES=1 -DHAVE_CAN_UCBINTS=1 \
-DHAVE_CAN_INT8TYPE=1 -DHAVE_CAN_UCBINT8=1 -DHAVE_RLIM_T=1 \
-DHAVE_SIG_T=1 -DHAVE_SYS_SIGNAME=1 -DHAVE_SYS_SIGLIST=1 \
• implement fcntl(2)-based advisory locking as an alternative iff flock(2) is not found, from a suggestion by RT (LP: #912691) • try harder (in a loop) to acquire a file lock if the locking mechanism documents EINTR is a possibility (fcntl always, flock on Linux not .Ox) • use -std=c99 not -std=gnu99 if it must be at all
2012-03-28 00:36:53 +02:00
-DHAVE_STRSIGNAL=0 -DHAVE_FLOCK=1 -DHAVE_LOCK_FCNTL=1 \
-DHAVE_MMAP=1 -DHAVE_GETRUSAGE=1 -DHAVE_KILLPG=1 \
sync… various things
2011-04-09 20:47:14 +02:00
-DHAVE_MKNOD=0 -DHAVE_MKSTEMP=1 -DHAVE_NICE=1 -DHAVE_REVOKE=1 \
re-vamp __attribute__ handling; let this pass on HP-UX bundled compiler as well as HP aCC
2009-12-12 23:27:10 +01:00
-DHAVE_SETLOCALE_CTYPE=0 -DHAVE_LANGINFO_CODESET=0 \
• more comment and int→bool cleanup, add and improve some comments • in interactive mode, always look up {LC_{ALL,CTYPE},LANG} environment variables if setlocale/nl_langinfo(CODESET) doesn’t suffice • add the ability to call any builtin (some don't make sense or wouldn't work) directly by analysing argv[0] • for direct builtin calls, the {LC_{ALL,CTYPE},LANG} environment variables determine utf8-mode, even if MKSH_ASSUME_UTF8 was set • when called as builtin, echo behaves POSIXish • add domainname as alias for true on MirBSD only, to be able to link it • sync mksh Makefiles with Build.sh output • adjust manpage wrt release plans • link some things to mksh now that we have callable builtins: bin/echo bin/kill bin/pwd bin/sleep (exact matches) bin/test bin/[ (were scripts before) bin/domainname=usr/bin/true usr/bin/false (move to /bin/ now) • drop linked utilities and, except for echo and kill, their manpages • adjust instbin and link a few more there as well
2011-02-11 02:18:23 +01:00
-DHAVE_SELECT=1 -DHAVE_SETRESUGID=1 -DHAVE_SETGROUPS=1 \
-DHAVE_STRCASESTR=1 -DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 \
-DHAVE_REVOKE_DECL=1 -DHAVE_SYS_SIGLIST_DECL=1 \
-DHAVE_PERSISTENT_HISTORY=1
followup for cid 1004EE408E1382C1752 and 1004EE40DDD498FBB0D: do a mirtoconf run-time check (ugh) to see whether the CPU designers smoked/were brain-dead or if we don’t actually need the manual check
2011-12-31 03:04:18 +01:00
# probably differs between i386 and sparc
CPPFLAGS+= -DHAVE_SILENT_IDIVWRAPV=0
You have this ↓ guy a lot to thank for. 00:45 -!- variable [root@freebsd/developer/variable] has joined #!/bin/mksh • +b *!*root@*, +b $a:root, +b $r:root on one more channel • certain checks to prevent: 00:47 < variable> wjcw: sh.h:308: error: conflicting types for 'getrusage' 01:19 < variable> oh 01:19 < variable> I needed to run Build.sh
2012-03-27 23:23:52 +02:00
CPPFLAGS+= -D${${PROG:L}_tf:C/(Mir${MAN:E}{0,1}){2}/4/:S/x/mksh_BUILD/:U}
• implement fcntl(2)-based advisory locking as an alternative iff flock(2) is not found, from a suggestion by RT (LP: #912691) • try harder (in a loop) to acquire a file lock if the locking mechanism documents EINTR is a possibility (fcntl always, flock on Linux not .Ox) • use -std=c99 not -std=gnu99 if it must be at all
2012-03-28 00:36:53 +02:00
COPTS+= -std=c99 -Wall
* new target 'test-build' to easily check Build.sh operation from mbsd * regen CPPFLAGS+= stuff with 'test-build'
2007-01-18 02:24:46 +01:00
.endif
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
"official" but unsupported printf-as-builtin code, cleaner API than in the branch; USE_PRINTF_BUILTIN=1 to enable it (Build.sh + Makefile)
2009-07-30 21:11:12 +02:00
USE_PRINTF_BUILTIN?= 0
.if ${USE_PRINTF_BUILTIN} == 1
.PATH: ${BSDSRCDIR}/usr.bin/printf
SRCS+= printf.c
CPPFLAGS+= -DMKSH_PRINTF_BUILTIN
.endif
efficient debug-to-file output (/tmp racy, but hey)
2012-03-23 20:38:12 +01:00
DEBUGFILE?= No
.if ${DEBUGFILE:L} == "yes"
CPPFLAGS+= -DDF=mksh_debugtofile
.endif
• more comment and int→bool cleanup, add and improve some comments • in interactive mode, always look up {LC_{ALL,CTYPE},LANG} environment variables if setlocale/nl_langinfo(CODESET) doesn’t suffice • add the ability to call any builtin (some don't make sense or wouldn't work) directly by analysing argv[0] • for direct builtin calls, the {LC_{ALL,CTYPE},LANG} environment variables determine utf8-mode, even if MKSH_ASSUME_UTF8 was set • when called as builtin, echo behaves POSIXish • add domainname as alias for true on MirBSD only, to be able to link it • sync mksh Makefiles with Build.sh output • adjust manpage wrt release plans • link some things to mksh now that we have callable builtins: bin/echo bin/kill bin/pwd bin/sleep (exact matches) bin/test bin/[ (were scripts before) bin/domainname=usr/bin/true usr/bin/false (move to /bin/ now) • drop linked utilities and, except for echo and kill, their manpages • adjust instbin and link a few more there as well
2011-02-11 02:18:23 +01:00
MANLINKS= [ false pwd sh sleep test true
BINLINKS= ${MANLINKS} echo domainname kill
.for _i in ${BINLINKS}
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${_i}
.endfor
.for _i in ${MANLINKS}
MLINKS+= ${PROG}.1 ${_i}.1
.endfor
switch /bin/sh to mksh this at least gets us rid of a bunch of segfaults on freewrt openssl builds
2006-07-23 21:10:59 +02:00
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
regress: ${PROG} check.pl check.t
clean regress-dir before re-using
2007-01-12 02:11:03 +01:00
-rm -rf regress-dir
auto-test check.t:mkshrc-1 as well (verified to work)
2006-05-08 14:18:49 +02:00
mkdir -p regress-dir
echo export FNORD=666 >regress-dir/.mkshrc
use mksh realpath builtin instead of readlink -f for canonicalisation note: there’s still a readlink(1) call left in, for instance, mirmake; this does not hurt because we initially assumed that readlink(1) does exist anyway and bundled ours just because some do not have the ‘-f’ option for realpath(2)isation
2008-10-05 18:26:13 +02:00
HOME=$$(realpath regress-dir) perl ${.CURDIR}/check.pl \
disable deprecated code on MirBSD-current mksh-current (note: next to deprecate is support for parsing $((010)) as octal, which is agreed gecko2@ tonight at the Jugo already)
2011-12-08 23:19:16 +01:00
-s ${.CURDIR}/check.t -v -p ./${PROG} -C fastbox,nodeprecated
auto-test check.t:mkshrc-1 as well (verified to work)
2006-05-08 14:18:49 +02:00
* new target 'test-build' to easily check Build.sh operation from mbsd * regen CPPFLAGS+= stuff with 'test-build'
2007-01-18 02:24:46 +01:00
test-build: .PHONY
-rm -rf build-dir
mkdir -p build-dir
unbreak test-build with printf
2011-10-07 21:51:17 +02:00
.if ${USE_PRINTF_BUILTIN} == 1
cp ${BSDSRCDIR}/usr.bin/printf/printf.c build-dir/
.endif
* new target 'test-build' to easily check Build.sh operation from mbsd * regen CPPFLAGS+= stuff with 'test-build'
2007-01-18 02:24:46 +01:00
cd build-dir; env CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
CPPFLAGS=${CPPFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q} \
LIBS= NOWARN=-Wno-error TARGET_OS= CPP= /bin/sh \
add a -f option to test.sh that runs tests of class fastbox plus a test in that category for a bug spotted during development of https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=shellsnippets/shellsnippets.git;a=blob;f=mksh/sysadmin/getjpics.cgi;h=d74018cbc1ae4e88408267ecc73a6df19aa4c99a;hb=HEAD
2011-11-26 00:29:31 +01:00
${.CURDIR}/Build.sh -Q -r && ./test.sh -v -f
auto-test check.t:mkshrc-1 as well (verified to work)
2006-05-08 14:18:49 +02:00
* new target 'test-build' to easily check Build.sh operation from mbsd * regen CPPFLAGS+= stuff with 'test-build'
2007-01-18 02:24:46 +01:00
cleandir: clean-extra
clean-extra: .PHONY
sync cleandir target
2009-07-30 21:18:06 +02:00
-rm -rf build-dir regress-dir printf.o printf.ln
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
You have this ↓ guy a lot to thank for. 00:45 -!- variable [root@freebsd/developer/variable] has joined #!/bin/mksh • +b *!*root@*, +b $a:root, +b $r:root on one more channel • certain checks to prevent: 00:47 < variable> wjcw: sh.h:308: error: conflicting types for 'getrusage' 01:19 < variable> oh 01:19 < variable> I needed to run Build.sh
2012-03-27 23:23:52 +02:00
mksh_tf=xMakefile${OStype:S/${MACHINE_OS}/1/1g}${OSNAME}
• from a MirOS point of view: place most stuff from /etc/profile in /etc/skel/.mkshrc; admins must make sure to copy this file to users' homes on upgrade (benefit: non-login but interactive shells also get all the goodies); fix some quoting; simplify, reformat, change comments • from an mksh point of view: slight internal changes in dot.mkshrc; external commands are now prefixed with “ulimit -c 0”; $TERM is defined; improvement in determining the host name (e.g. on Debian if a FQDN is not given); declare locals as such both in $PS1 and outside; remove superfluous quoting, quote properly; simplify hd alias, add rot13 alias; place RCS ID at the bottom
2007-04-16 20:54:37 +02:00
distribution:
we need more RCS IDs!
2009-08-27 18:52:12 +02:00
sed 's!\$$I''d\([:$$]\)!$$M''irSecuCron\1!g' \
${.CURDIR}/dot.mkshrc >${DESTDIR}/etc/skel/.mkshrc
chown ${BINOWN}:${CONFGRP} ${DESTDIR}/etc/skel/.mkshrc
chmod 0644 ${DESTDIR}/etc/skel/.mkshrc
• from a MirOS point of view: place most stuff from /etc/profile in /etc/skel/.mkshrc; admins must make sure to copy this file to users' homes on upgrade (benefit: non-login but interactive shells also get all the goodies); fix some quoting; simplify, reformat, change comments • from an mksh point of view: slight internal changes in dot.mkshrc; external commands are now prefixed with “ulimit -c 0”; $TERM is defined; improvement in determining the host name (e.g. on Debian if a FQDN is not given); declare locals as such both in $PS1 and outside; remove superfluous quoting, quote properly; simplify hd alias, add rot13 alias; place RCS ID at the bottom
2007-04-16 20:54:37 +02:00
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
.include <bsd.prog.mk>
Reference in New Issue Copy Permalink