debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtksh: make it build under openindiana

Browse Source
This commit is contained in:
Chase
2021-01-17 14:16:11 -06:00
committed by Jon Trulson
parent e75a8162ad
commit 47dfe49a72
11 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtksh/Imakefile
View File

@@ -29,8 +29,7 @@ LOCAL_LDFLAGS = -bE:dtksh.exp
#ifdef SunArchitecture #ifdef SunArchitecture
.NO_PARALLEL: .NO_PARALLEL:
/* These need to be manually set for Solaris due to a bug in the build system */ SYS_LIBRARIES = -lm -lsecdb -lsocket -lnsl
KSH_LDFLAGS = -lm -lsocket
#endif #endif
DEPEND_DEFINES = $(DEPENDDEFINES) DEPEND_DEFINES = $(DEPENDDEFINES)

2
cde/programs/dtksh/dtkcmds.c
View File

@@ -58,9 +58,7 @@
#include "hash.h" #include "hash.h"
#include "stdio.h" #include "stdio.h"
#include "defs.h" #include "defs.h"
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "dtkcmds.h" #include "dtkcmds.h"
#include "xmcvt.h" #include "xmcvt.h"

2
cde/programs/dtksh/dtkcvt.c
View File

@@ -55,9 +55,7 @@
#include <Dt/Print.h> #include <Dt/Print.h>
#include "hash.h" #include "hash.h"
#include "stdio.h" #include "stdio.h"
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "XtCvtrs.h" #include "XtCvtrs.h"
#include "dtkcmds.h" #include "dtkcmds.h"

2
cde/programs/dtksh/dtksh.h
View File

@@ -33,9 +33,7 @@
#ifndef _Dtksh_dtksh_h #ifndef _Dtksh_dtksh_h
#define _Dtksh_dtksh_h #define _Dtksh_dtksh_h
#if !defined(NO_AST)
#include "nval.h" #include "nval.h"
#endif
#define SUCCESS 0 #define SUCCESS 0
#define FAIL (-1) #define FAIL (-1)

24
cde/programs/dtksh/init.patch
View File

@@ -1,31 +1,22 @@
--- ./ksh93/src/cmd/ksh93/sh/init.c 2020-11-22 15:34:35.964537420 -0600 --- ./ksh93/src/cmd/ksh93/sh/init.c 2021-01-16 15:27:03.589079734 -0600
+++ init.c 2020-12-31 19:31:00.091176802 -0600 +++ init.c 2021-01-16 15:53:50.700864511 -0600
@@ -48,6 +48,38 @@ @@ -48,6 +48,28 @@
#include "lexstates.h" #include "lexstates.h"
#include "version.h" #include "version.h"
+#ifdef BUILD_DTKSH +#ifdef BUILD_DTKSH
+#include <Dt/DtNlUtils.h> +#include <Dt/DtNlUtils.h>
+#include <Dt/EnvControlP.h> +#include <Dt/EnvControlP.h>
+#include <stdio.h>
+#include <nl_types.h>
+#include <X11/X.h> +#include <X11/X.h>
+#include <X11/Intrinsic.h> +#include <X11/Intrinsic.h>
+#include <X11/IntrinsicP.h> +#include <X11/IntrinsicP.h>
+#include <X11/CoreP.h> +#include <X11/CoreP.h>
+#include <X11/StringDefs.h> +#include <X11/StringDefs.h>
+#include <Xm/XmStrDefs.h> +#include <Xm/XmStrDefs.h>
+#include <setjmp.h>
+#include <string.h>
+#include <ctype.h>
+#include <Xm/Xm.h> +#include <Xm/Xm.h>
+#include <Xm/Protocols.h> +#include <Xm/Protocols.h>
+#include "hash.h"
+#include "stdio.h"
+ +
+#define NO_AST
+#include "dtksh.h" +#include "dtksh.h"
+#undef NO_AST
+#include "xmksh.h" +#include "xmksh.h"
+#include "dtkcmds.h" +#include "dtkcmds.h"
+#include "xmcvt.h" +#include "xmcvt.h"
@@ -33,16 +24,15 @@
+#include "extra.h" +#include "extra.h"
+#include "xmwidgets.h" +#include "xmwidgets.h"
+#include "msgs.h" +#include "msgs.h"
+#include <locale.h>
+#endif +#endif
+ +
#if _hdr_wctype #if _hdr_wctype
#include <ast_wchar.h> #include <ast_wchar.h>
#include <wctype.h> #include <wctype.h>
@@ -1469,6 +1501,16 @@ @@ -1481,6 +1503,16 @@
#endif shp->exittrap = 0;
if(shp->userinit=userinit) shp->errtrap = 0;
(*userinit)(shp, 0); shp->end_fn = 0;
+#ifdef BUILD_DTKSH +#ifdef BUILD_DTKSH
+ int * lockedFds = LockKshFileDescriptors(); + int * lockedFds = LockKshFileDescriptors();
+ (void) XtSetLanguageProc((XtAppContext)NULL, (XtLanguageProc)NULL, + (void) XtSetLanguageProc((XtAppContext)NULL, (XtLanguageProc)NULL,

2
cde/programs/dtksh/ksh93

Submodule cde/programs/dtksh/ksh93 updated: 737438a30f...6025c8125e

2
cde/programs/dtksh/widget.c
View File

@@ -42,9 +42,7 @@
#include <Xm/DialogS.h> #include <Xm/DialogS.h>
#include "hash.h" #include "hash.h"
#include "stdio.h" #include "stdio.h"
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "dtkcmds.h" #include "dtkcmds.h"
#include "xmcvt.h" #include "xmcvt.h"

2
cde/programs/dtksh/widget.h
View File

@@ -45,9 +45,7 @@
#include <X11/X.h> #include <X11/X.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
extern int Wtab_free; extern int Wtab_free;
extern wtab_t **W; extern wtab_t **W;

2
cde/programs/dtksh/xmcmds.c
View File

@@ -47,9 +47,7 @@
#include <Xm/Protocols.h> #include <Xm/Protocols.h>
#include "hash.h" #include "hash.h"
#include "stdio.h" #include "stdio.h"
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "dtkcmds.h" #include "dtkcmds.h"
#include "XtCvtrs.h" #include "XtCvtrs.h"

2
cde/programs/dtksh/xmcvt.c
View File

@@ -55,9 +55,7 @@
#include <Tt/tttk.h> #include <Tt/tttk.h>
#include "hash.h" #include "hash.h"
#include "stdio.h" #include "stdio.h"
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "XtCvtrs.h" #include "XtCvtrs.h"
#include "dtkcmds.h" #include "dtkcmds.h"

2
cde/programs/dtksh/xmwidgets.c
View File

@@ -77,9 +77,7 @@
#include <Dt/HelpQuickD.h> #include <Dt/HelpQuickD.h>
#include <Dt/Print.h> #include <Dt/Print.h>
#define NO_AST
#include "dtksh.h" #include "dtksh.h"
#undef NO_AST
#include "xmksh.h" #include "xmksh.h"
#include "dtkcmds.h" #include "dtkcmds.h"