9base

commit a79f3c442afd90cc8aecb277c8b477dde3f16f22
parent 83bc57946a86e2e6bc7b25b73cb8052c16a70880
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Sat, 21 Jan 2006 13:56:49 +0200

applied patches to allow compilation on SunOS

Diffstat:
M
Makefile
 | 
8
++++----
M
bc/Makefile
 | 
2
++
M
config.mk
 | 
8
++++++++
M
rc/Makefile
 | 
3
+++
M
rc/exec.c
 | 
3
+++
M
sleep/Makefile
 | 
3
+++
M
test/Makefile
 | 
3
+++

7 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -12,18 +12,18 @@ all:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 	@chmod 755 yacc/9yacc
-	@for i in ${SUBDIRS}; do cd $$i; make || exit; cd ..; done;
+	@for i in ${SUBDIRS}; do cd $$i; ${MAKE} || exit; cd ..; done;
 
 clean:
-	@for i in ${SUBDIRS}; do cd $$i; make clean || exit; cd ..; done
+	@for i in ${SUBDIRS}; do cd $$i; ${MAKE} clean || exit; cd ..; done
 	@echo cleaned 9base
 
 install: all
-	@for i in ${SUBDIRS}; do cd $$i; make install || exit; cd ..; done
+	@for i in ${SUBDIRS}; do cd $$i; ${MAKE} install || exit; cd ..; done
 	@echo installed 9base to ${DESTDIR}${PREFIX}
 
 uninstall:
-	@for i in ${SUBDIRS}; do cd $$i; make uninstall || exit; cd ..; done
+	@for i in ${SUBDIRS}; do cd $$i; ${MAKE} uninstall || exit; cd ..; done
 	@echo uninstalled 9base
 
 dist: clean
diff --git a/bc/Makefile b/bc/Makefile
@@ -7,3 +7,5 @@ YFILES	  = bc.y
 MANFILES  = bc.1
 
 include ../yacc.mk
+
+LDFLAGS += -dy -lxnet
diff --git a/config.mk b/config.mk
@@ -9,6 +9,14 @@ VERSION     = 20060110
 CFLAGS      = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
 LDFLAGS     = -static
 
+# Linux/BSD
+CFLAGS      = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
+LDFLAGS     = -static
+
+# Solaris
+#CFLAGS      = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
+#LDFLAGS     = -dn
+
 # compiler
 AR          = ar rc
 CC          = cc
diff --git a/rc/Makefile b/rc/Makefile
@@ -10,6 +10,9 @@ MANFILES  = rc.1
 
 include ../config.mk
 
+# Solaris
+#LDFLAGS   += -dy -lxnet
+
 all:
 	@if [ ! -f y.tab.c ]; then \
 	make -f Makefile depend;\
diff --git a/rc/exec.c b/rc/exec.c
@@ -3,6 +3,9 @@
 #if defined(PLAN9PORT) && defined(__sun__)
 #	define BSD_COMP	/* sigh.  for TIOCNOTTY */
 #endif
+#ifdef __sun__
+#include <sys/termios.h>
+#endif
 #include <sys/ioctl.h>
 #include "rc.h"
 #include "getflags.h"
diff --git a/sleep/Makefile b/sleep/Makefile
@@ -4,3 +4,6 @@
 TARG      = sleep
 
 include ../std.mk
+
+# Solaris
+#LDFLAGS   += -dy -lrt
diff --git a/test/Makefile b/test/Makefile
@@ -4,3 +4,6 @@
 TARG      = test
 
 include ../std.mk
+
+# Solaris
+#LDFLAGS   += -dy