Changeset 192 in kBuild

Timestamp:

Dec 17, 2004 3:37:43 AM (20 years ago)

Author:

bird

Message:

fixing / libc

Location:

trunk/src/gmake

Files:

• Makefile.OS2.libc (modified) (2 diffs)
• config.h.OS2.libc (modified) (5 diffs)
• default.c (modified) (9 diffs)
• job.c (modified) (3 diffs)

trunk/src/gmake/Makefile.OS2.libc

@@ -2 +2 @@
 
 OBJDIR = objdir/OS2.libc
-OBJDIR = .
+#OBJDIR = .
 SRC =   ar.c arscan.c commands.c default.c dir.c expand.c file.c \
                 function.c implicit.c job.c main.c \
@@ -8 +8 @@
                 variable.c version.c vpath.c hash.c \
         getopt.c getopt1.c remote-stub.c
-CFLAGS = -Zomf -g -DMAKE_DLLSHELL -Wall
+OBJS = $(addprefix $(OBJDIR)/, $(SRC:.c=.obj))
+CFLAGS = -Zomf -g -Wall -I$(OBJDIR) -I.  -DCONFIG_NO_DEFAULT_SUFFIXES \
+    -DCONFIG_NO_DEFAULT_PATTERN_RULES -DCONFIG_NO_DEFAULT_TERMINAL_RULES \
+    -DCONFIG_NO_DEFAULT_SUFFIX_RULES
 ifndef DEBUG
 CFLAGS += -O3
 endif
+#-DMAKE_DLLSHELL
 
-all: $(OBJDIR) make-new.exe
+all: $(OBJDIR) $(OBJDIR)/make-new.exe
 
-make-new.exe: config.h $(addprefix $(OBJDIR)/, $(SRC:.c=.obj))
-        gcc -g $(CFLAGS) -Zhigh-mem -Zstack 1024 -o $@ $(SRC:.c=.obj) -ldl
+clean:
+        rm -f $(OBJS) $(OBJDIR)/make-new.exe $(OBJDIR)/config.h
 
-.c.obj:
+$(OBJDIR)/make-new.exe: $(OBJDIR)/config.h $(OBJS)
+        gcc -g $(CFLAGS) -Zhigh-mem -Zstack 1024 -o $@ $(OBJS)
+
+$(OBJDIR)/%.obj : %.c
         gcc -c $(CFLAGS) -o $@ -DHAVE_CONFIG_H  $<
 
-config.h: config.h.OS2.libc
+$(OBJDIR)/config.h: config.h.OS2.libc
         cp $< $@
 
 $(OBJDIR):
-        mkdir -p $@
+        mkdir.exe -p $@
 
+test:
+        echo "1"
+        echo "2"
+        echo "3"
+        echo "4"

trunk/src/gmake/config.h.OS2.libc

@@ -87 +87 @@
 
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#undef HAVE_SYS_WAIT_H 1
+#define HAVE_SYS_WAIT_H 1
 
 /* Define if your struct tm has tm_zone.  */
@@ -216 +216 @@
 
 /* Define this if the C library defines the variable `sys_siglist'.  */
-/* #undef HAVE_SYS_SIGLIST */
+#define HAVE_SYS_SIGLIST 1
 
 /* Define this if the C library defines the variable `_sys_siglist'.  */
@@ -287 +287 @@
 
 /* Define if you have the strsignal function.  */
-/* #undef HAVE_STRSIGNAL */
+#define HAVE_STRSIGNAL
 
 /* Define if you have the wait3 function.  */
-/* #undef HAVE_WAIT3 */
+#define HAVE_WAIT3 1
 
 /* Define if you have the waitpid function.  */
@@ -405 +405 @@
 #define LIBDIR "."
 
+#define HAVE_SA_RESTART 1
+
+#if 0
 static inline int getloadavg(double loadavg[], int nelem)
 {
@@ -414 +417 @@
     return 0;
 }
-
-
-#if 1
+#endif
+
+
+#if 0
 #include <string.h>
 

trunk/src/gmake/default.c

@@ -38 +38 @@
 
 static char default_suffixes[]
+#ifndef CONFIG_NO_DEFAULT_SUFFIXES
 #ifdef VMS
   = ".exe .olb .ln .obj .c .cxx .cc .pas .p .for .f .r .y .l .mar \
@@ -51 +52 @@
 .w .ch .web .sh .elc .el";
 #endif
+#else  /* CONFIG_NO_DEFAULT_SUFFIXES */
+ = "";
+#endif /* CONFIG_NO_DEFAULT_SUFFIXES */
 
 static struct pspec default_pattern_rules[] =
   {
+#ifndef CONFIG_NO_DEFAULT_PATTERN_RULES
     { "(%)", "%",
         "$(AR) $(ARFLAGS) $@ $<" },
@@ -72 +77 @@
     { "%.tex", "%.w %.ch",
         "$(CWEAVE) $^ $@" },
-
+#endif /* !CONFIG_NO_DEFAULT_PATTERN_RULES */
     { 0, 0, 0 }
   };
@@ -78 +83 @@
 static struct pspec default_terminal_rules[] =
   {
+#ifndef CONFIG_NO_DEFAULT_TERMINAL_RULES
 #ifdef VMS
     /* RCS.  */
@@ -106 +112 @@
         "$(GET) $(GFLAGS) $(SCCS_OUTPUT_OPTION) $<" },
 #endif /* !VMS */
+#endif /* !CONFIG_NO_DEFAULT_TERMINAL_RULES */
     { 0, 0, 0 }
   };
@@ -111 +118 @@
 static char *default_suffix_rules[] =
   {
+#ifndef CONFIG_NO_DEFAULT_SUFFIX_RULES
 #ifdef VMS
     ".obj.exe",
@@ -300 +308 @@
 
 #endif /* !VMS */
-
+#endif /* !CONFIG_NO_DEFAULT_SUFFIX_RULES */
     0, 0,
   };
@@ -306 +314 @@
 static char *default_variables[] =
   {
+#ifndef CONFIG_NO_DEFAULT_VARIABLES
 #ifdef VMS
 #ifdef __ALPHA
@@ -512 +521 @@
 
 #endif /* !VMS */
+#endif /* !CONFIG_NO_DEFAULT_VARIABLES */
     0, 0
   };

trunk/src/gmake/job.c

@@ -437 +437 @@
     }
 
-#ifdef __EMX__
+#if defined __EMX__ && !defined(__INNOTEK_LIBC__)
   /* The signal handler must called only once! */
   signal (SIGCHLD, SIG_DFL);
@@ -1205 +1205 @@
 
       /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-      child_execute_job (child->good_stdin ? 0 : bad_stdin, 1,
-                         argv, child->environment, child);
+      child->pid = child_execute_job (child->good_stdin ? 0 : bad_stdin, 1,
+                                      argv, child->environment, child);
       if (child->pid < 0)
         {
@@ -1649 +1649 @@
         got_token = read (job_rfd, &token, 1);
         saved_errno = errno;
-#ifdef __EMX__
+#if defined(__EMX__) && !defined(__INNOTEK_LIBC__)
         /* The child handler must be turned off here.  */
         signal (SIGCHLD, SIG_DFL);