ASH diff (was Re: Login prompt)

Randy Janinda randy.janinda at ndcorp.com
Thu Jul 13 09:18:13 PDT 2000


On Thu, Jul 13, 2000 at 08:51:10AM -0700, Eric A. Ayer decided:
> > I was able to get ash working.  I used the slackware patch.
> > 
> > Tom Veldhouse
> > veldy at veldy.net
> 
> Cool!  Where is this patch?

Here's the diff I used against ash-linux-0.2

Randy
-------------- next part --------------
diff -urN ash-linux-0.2.orig/Makefile ash-linux-0.2/Makefile
--- ash-linux-0.2.orig/Makefile	Mon Oct  4 11:48:13 1993
+++ ash-linux-0.2/Makefile	Wed Jun 21 19:41:03 2000
@@ -14,8 +14,10 @@
 
 OBJS =	$(OBJ1) $(OBJ2)
 
-CFLAGS = -O2 -fomit-frame-pointer -m486 -DSHELL -I/usr/include/bsd -I.
-LDFLAGS = -s -lbsd
+HOSTCC = gcc
+CC     = i386-linux-gcc
+CFLAGS = -O2 -fsigned-char -pipe -DSHELL -I. -D__BIT_TYPES_DEFINED__
+LDFLAGS = -s
 
 CLEANFILES =\
 	builtins.c builtins.h init.c mkinit mknodes mksyntax \
@@ -32,7 +34,7 @@
 token.def: mktokens
 	sh ./mktokens
 
-builtins.h builtins.c: mkbuiltins builtins
+builtins.h builtins.c: mkbuiltins
 	sh ./mkbuiltins
 
 init.c: mkinit $(SRCS)
@@ -40,19 +42,19 @@
 	touch init.c
 
 mkinit: mkinit.c
-	$(CC) $(CFLAGS) $(LDFLAGS) mkinit.c -o $@ $(LDADD)
+	$(HOSTCC) $(CFLAGS) $(LDFLAGS) mkinit.c -o $@ $(LDADD)
 
 nodes.c nodes.h: mknodes nodetypes nodes.c.pat
 	./mknodes nodetypes nodes.c.pat
 
 mknodes: mknodes.c
-	$(CC) $(CFLAGS) $(LDFLAGS) mknodes.c -o $@ $(LDADD)
+	$(HOSTCC) $(CFLAGS) $(LDFLAGS) mknodes.c -o $@ $(LDADD)
 
 syntax.c syntax.h: mksyntax
 	./mksyntax
 
 mksyntax: mksyntax.c parser.h
-	$(CC) $(CFLAGS) $(LDFLAGS) mksyntax.c -o $@ $(LDADD)
+	$(HOSTCC) $(CFLAGS) $(LDFLAGS) mksyntax.c -o $@ $(LDADD)
 
 clean:
 	rm -f core $(CLEANFILES) $(PROG) $(OBJS)
diff -urN ash-linux-0.2.orig/mknodes.c ash-linux-0.2/mknodes.c
--- ash-linux-0.2.orig/mknodes.c	Mon Sep  6 02:04:23 1993
+++ ash-linux-0.2/mknodes.c	Wed Jun 21 19:41:03 2000
@@ -89,7 +89,7 @@
 struct str *curstr;		/* current structure */
 
 
-FILE *infp = stdin;
+FILE *infp;
 char line[1024];
 int linno;
 char *linep;
@@ -102,6 +102,7 @@
 main(argc, argv)
 	char **argv;
 {
+        infp = stdin;
 	if (argc != 3) {
 		error("usage: mknodes file\n");
 		return(1);


More information about the lfs-dev mailing list