I appear to have missed a non-fatal error in the depend process. I will need to
move building ksh back to the top makefile, however this will probably be able
to be moved back when I port it to autotools. Patch attached (merge this after
the first patch I attached).
Thank you for your time,
-Chase
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Monday, December 28, 2020 10:49 PM, Chase via cdesktopenv-devel
<cdesktopenv-devel@lists.sourceforge.net> wrote:
> Marcin pointed out to me that the shell command in make is a gnu extension
> and is thus not portable. The solution to this was to use "flat make" that
> puts the ksh binary in a static directory, which also allowed me to undo the
> weird workaround I had to implement in the topmost makefile. This commit also
> trims some fat by removing unused symbols and a strange hpux dynlib
> implementation (hpux is posix anyways).
>
> Thank you for your time,
> -Chase
From 5c2b9087cc643ca193efd694b8db90a648c069d3 Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Tue, 29 Dec 2020 21:38:08 -0600
Subject: [PATCH] dtksh: fix init.c .depend error
---
cde/Makefile | 6 ++++++
cde/programs/dtksh/Imakefile | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/cde/Makefile b/cde/Makefile
index fcc8639c5..095d71e28 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -23,6 +23,11 @@
FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
CDE_CONFIGURATION_TOP = /etc/dt
CDE_INSTALLATION_TOP = /usr/dt
+SUIDEXECDEFINES = \
+ -DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \
+ -DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \
+ -DSUIDEXECPATH=\"$(CDE_INSTALLATION_TOP)/bin/suid_exec\" \
+ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DBUILD_DTKSH
all:
@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
@@ -60,6 +65,7 @@ World:
$(MAKE_CMD) $(MFLAGS) Makefiles.doc
$(MAKE_CMD) $(MFLAGS) clean
$(MAKE_CMD) $(MFLAGS) clean.doc
+ cd programs/dtksh/ksh93; ./bin/package flat make CCFLAGS='$(SUIDEXECDEFINES) -g'
$(MAKE_CMD) $(MFLAGS) includes
$(MAKE_CMD) $(MFLAGS) includes.doc
$(MAKE_CMD) $(MFLAGS) depend
diff --git a/cde/programs/dtksh/Imakefile b/cde/programs/dtksh/Imakefile
index 298ccc806..ec6a48bc0 100644
--- a/cde/programs/dtksh/Imakefile
+++ b/cde/programs/dtksh/Imakefile
@@ -105,7 +105,6 @@ libshell.a: $(KSH93LIBSHELL) init.o
$(AR) libshell.a init.o
pmain.o:
- cd ksh93; ./bin/package flat make CCFLAGS='$(SUIDEXECDEFINES) -g'
./setup.sh
cp ./ksh93/bin/suid_exec suid_exec
--
2.17.1
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
