use a patchfile to augment init.c instead of copying it entirely

This commit is contained in:
Chase
2021-01-01 13:54:48 -06:00
committed by Jon Trulson
parent 90fff44682
commit 428223ee80
5 changed files with 65 additions and 2149 deletions

View File

@@ -56,7 +56,7 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(DTPRINTLIB) \
$(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a \
$(KSH93SRC)/lib/libdll.a libshell.a
EXTRA_DEFINES = -DKSHELL -DSHOPT_RAWONLY
EXTRA_DEFINES = -DKSHELL -DSHOPT_RAWONLY '-DAST_VERSION=20111111'
EXTRA_INCLUDES = -I$(DTHELPSRC) -I$(DTPRINTSRC)
@@ -70,8 +70,7 @@ KSH93LIBSHELL = $(KSH93SRC)/lib/libshell.a
PROGRAMS = dtksh
SRCS = init.c \
widget.c \
SRCS = widget.c \
dtkcvt.c \
dtkcmds.c \
XtCvtrs.c \
@@ -84,6 +83,7 @@ SRCS = init.c \
OBJS = \
pmain.o \
init.o \
libshell.a \
widget.o \
dtkcvt.o \
@@ -106,8 +106,9 @@ libshell.a: $(KSH93LIBSHELL) init.o
pmain.o:
cd ksh93; ./bin/package flat make CCFLAGS='$(SUIDEXECDEFINES) -g'
cp ./ksh93/src/cmd/ksh93/sh/init.c init.c
patch -u init.c -i init.patch
./setup.sh
cp ./ksh93/bin/suid_exec suid_exec
SpecialObjectRule(init.o, $(NULL), -DSHOPT_STATS -DSHOPT_NAMESPACE -DSHOPT_2DMATCH -DSHOPT_PFSH -DSHOPT_MULTIBYTE -DSHOPT_BGX -DSHOPT_AUDIT '-D_API_ast=20100309' -D_PACKAGE_ast -DSHOPT_DYNAMIC -D_BLD_shell -DSHOPT_KIA -DKSHELL -DSHOPT_HISTEXPAND -DSHOPT_EDPREDICT -DSHOPT_ESH -DSHOPT_VSH -DSHOPT_FIXEDARRAY '-DERROR_CONTEXT_T=Error_context_t' -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DBUILD_DTKSH -l$(KSH93SRC)/lib/libcmd.a -l$(KSH93SRC)/lib/libast.a -l$(KSH93SRC)/lib/libdll.a)
@@ -115,5 +116,5 @@ ComplexProgramTarget($(PROGRAMS))
clean::
cd ksh93; ./bin/package flat clean
rm -f suid_exec
rm -f init.c
rm -rf FEATURE