Only in gnumake-130: Makefile Only in gnumake-130: config.h diff -ru make-3.81/default.c gnumake-130/default.c --- make-3.81/default.c 2006-02-11 14:16:04.000000000 -0800 +++ gnumake-130/default.c 2011-12-22 12:02:13.000000000 -0800 @@ -45,7 +45,7 @@ .mod .sym .def .h .info .dvi .tex .texinfo .texi .txinfo \ .w .ch .web .sh .elc .el .obj .exe .dll .lib"; #else - = ".out .a .ln .o .c .cc .C .cpp .p .f .F .r .y .l .s .S \ + = ".out .a .ln .o .c .cc .C .cpp .p .f .F .m .r .y .l .ym .lm .s .S \ .mod .sym .def .h .info .dvi .tex .texinfo .texi .txinfo \ .w .ch .web .sh .elc .el"; #endif @@ -192,6 +192,8 @@ "$(LINK.cpp) $^ $(LOADLIBES) $(LDLIBS) -o $@", ".f", "$(LINK.f) $^ $(LOADLIBES) $(LDLIBS) -o $@", + ".m", + "$(LINK.m) $^ $(LOADLIBES) $(LDLIBS) -o $@", ".p", "$(LINK.p) $^ $(LOADLIBES) $(LDLIBS) -o $@", ".F", @@ -221,6 +223,8 @@ "$(COMPILE.cpp) $(OUTPUT_OPTION) $<", ".f.o", "$(COMPILE.f) $(OUTPUT_OPTION) $<", + ".m.o", + "$(COMPILE.m) $(OUTPUT_OPTION) $<", ".p.o", "$(COMPILE.p) $(OUTPUT_OPTION) $<", ".F.o", @@ -250,6 +254,11 @@ ".l.c", "@$(RM) $@ \n $(LEX.l) $< > $@", + ".ym.m", + "$(YACC.m) $< \n mv -f y.tab.c $@", + ".lm.m", + "@$(RM) $@ \n $(LEX.m) $< > $@", + ".F.f", "$(PREPROCESS.F) $(OUTPUT_OPTION) $<", ".r.f", @@ -304,6 +313,9 @@ static char *default_variables[] = { +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + "GNUMAKE", "YES", /* I'm not sure who uses this. Dave Payne 8/10/99 */ +#endif /* __APPLE__ || NeXT || NeXT_PDO */ #ifdef VMS #ifdef __ALPHA "ARCH", "ALPHA", @@ -400,7 +412,7 @@ # endif /* __MSDOS__ */ #else "CC", "cc", - "CXX", "g++", + "CXX", "c++", #endif /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist, @@ -468,6 +480,8 @@ "LINK.o", "$(CC) $(LDFLAGS) $(TARGET_ARCH)", "COMPILE.c", "$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c", "LINK.c", "$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH)", + "COMPILE.m", "$(COMPILE.c)", + "LINK.m", "$(LINK.c)", "COMPILE.cc", "$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c", "COMPILE.C", "$(COMPILE.cc)", "COMPILE.cpp", "$(COMPILE.cc)", @@ -476,6 +490,8 @@ "LINK.cpp", "$(LINK.cc)", "YACC.y", "$(YACC) $(YFLAGS)", "LEX.l", "$(LEX) $(LFLAGS) -t", + "YACC.m", "$(YACC) $(YFLAGS)", + "LEX.m", "$(LEX) $(LFLAGS) -t", "COMPILE.f", "$(FC) $(FFLAGS) $(TARGET_ARCH) -c", "LINK.f", "$(FC) $(FFLAGS) $(LDFLAGS) $(TARGET_ARCH)", "COMPILE.F", "$(FC) $(FFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c", diff -ru make-3.81/expand.c gnumake-130/expand.c --- make-3.81/expand.c 2006-03-14 19:31:30.000000000 -0800 +++ gnumake-130/expand.c 2012-01-25 11:17:28.000000000 -0800 @@ -76,7 +76,11 @@ /* Return a pointer to the beginning of the variable buffer. */ +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) +char * +#else static char * +#endif initialize_variable_output (void) { /* If we don't have a variable output buffer yet, get one. */ @@ -90,6 +94,35 @@ return variable_buffer; } + +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) +char * +save_variable_output(savelenp) + int *savelenp; +{ + char *save; + + save = variable_buffer; + *savelenp = variable_buffer_length; + + variable_buffer = 0; + variable_buffer_length = 0; + + return (save); +} + +void +restore_variable_output (save, savelen) + char *save; + int savelen; +{ + if (variable_buffer != 0) + free (variable_buffer); + + variable_buffer = save; + variable_buffer_length = savelen; +} +#endif /* __APPLE__ || NeXT || NeXT_PDO */ /* Recursively expand V. The returned string is malloc'd. */ @@ -449,20 +482,25 @@ variable_expand_for_file (char *line, struct file *file) { char *result; - struct variable_set_list *save; + struct variable_set_list *savev; + const struct floc *savef; if (file == 0) return variable_expand (line); - save = current_variable_set_list; + savev = current_variable_set_list; current_variable_set_list = file->variables; + + savef = reading_file; if (file->cmds && file->cmds->fileinfo.filenm) reading_file = &file->cmds->fileinfo; else reading_file = 0; + result = variable_expand (line); - current_variable_set_list = save; - reading_file = 0; + + current_variable_set_list = savev; + reading_file = savef; return result; } diff -ru make-3.81/file.c gnumake-130/file.c --- make-3.81/file.c 2006-03-17 06:24:20.000000000 -0800 +++ gnumake-130/file.c 2011-12-22 12:02:13.000000000 -0800 @@ -207,6 +207,9 @@ rehash_file (from_file, to_hname); while (from_file) { +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + from_file->old_name = from_file->name; +#endif /* __APPLE__ || NeXT || NeXT_PDO */ from_file->name = from_file->hname; from_file = from_file->prev; } @@ -734,6 +737,14 @@ f2->command_flags |= COMMANDS_SILENT; } + f = lookup_file (".POSIX"); + if (f != 0 && f->is_target) { + posix_pedantic = 1; +#ifndef VMS + define_variable("ARFLAGS", 7, "-rv", o_default, 1); +#endif + } + f = lookup_file (".NOTPARALLEL"); if (f != 0 && f->is_target) not_parallel = 1; diff -ru make-3.81/filedef.h gnumake-130/filedef.h --- make-3.81/filedef.h 2006-02-11 14:16:04.000000000 -0800 +++ gnumake-130/filedef.h 2011-12-22 12:02:13.000000000 -0800 @@ -42,6 +42,10 @@ entries for the same file. */ struct file *last; /* Last entry for the same file name. */ +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + char *old_name; +#endif + /* File that this file was renamed to. After any time that a file could be renamed, call `check_renamed' (below). */ struct file *renamed; Only in gnumake-130: gnumake.plist Only in gnumake-130: gnumake.xcodeproj diff -ru make-3.81/implicit.c gnumake-130/implicit.c --- make-3.81/implicit.c 2006-03-31 22:36:40.000000000 -0800 +++ gnumake-130/implicit.c 2011-12-22 12:02:13.000000000 -0800 @@ -696,7 +696,7 @@ so it might actually exist. */ /* @@ dep->changed check is disabled. */ - if (((f = lookup_file (name)) != 0 && f->is_target) + if (((f = lookup_file (name)) != 0) /*|| ((!dep->changed || check_lastslash) && */ || file_exists_p (name)) continue; @@ -786,8 +786,24 @@ /* RULE is nil if the loop went all the way through the list and everything failed. */ +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) /* for NEXT_VPATH_FLAG support */ + if (rule == 0) { + if ((next_flag & NEXT_VPATH_FLAG) && file->old_name != 0) { + char *save_name = file->name; + file->name = file->old_name; + file->old_name = 0; + /* bad hack: rule should be non-null so the function returns a non-zero result */ + if (pattern_search(file, archive, depth, recursions)) + rule = (struct rule *)1; + file->old_name = file->name; + file->name = save_name; + } + goto done; + } +#else if (rule == 0) goto done; +#endif /* __APPLE__ || NeXT || NeXT_PDO */ foundrule = i; diff -ru make-3.81/job.c gnumake-130/job.c --- make-3.81/job.c 2006-03-19 19:03:04.000000000 -0800 +++ gnumake-130/job.c 2011-12-22 12:02:13.000000000 -0800 @@ -29,6 +29,9 @@ #include +#if USE_POSIX_SPAWN +#include +#endif /* Default shell to use. */ #ifdef WINDOWS32 #include @@ -971,6 +974,8 @@ #endif register char *p; int flags; + int already_set_status = 0; + char *saved_cmd_ptr = NULL; #ifdef VMS char *argv; #else @@ -986,8 +991,10 @@ flags = (child->file->command_flags | child->file->cmds->lines_flags[child->command_line - 1]); - p = child->command_ptr; - child->noerror = ((flags & COMMANDS_NOERROR) != 0); + saved_cmd_ptr = p = child->command_ptr; + /* noerror is a single bit, so unless COMMANDS_NOERROR has the low bit set, + the ?1:0 isn't redundant */ + child->noerror = (flags & COMMANDS_NOERROR) ? 1 : 0; while (*p != '\0') { @@ -1032,7 +1039,8 @@ /* If -q was given, say that updating `failed' if there was any text on the command line, or `succeeded' otherwise. The exit status of 1 tells the user that -q is saying `something to do'; the exit status for a random - error is 2. */ + error is 2. NOTE: in posix_pedantic mode we continue to look at commands, + without posix_pedantic we cna short curcuit */ if (argv != 0 && question_flag && !(flags & COMMANDS_RECURSE)) { #ifndef VMS @@ -1040,23 +1048,45 @@ free ((char *) argv); #endif child->file->update_status = 1; - notice_finished_file (child->file); - return; + already_set_status = 1; + if (!posix_pedantic) { + notice_finished_file (child->file); + return; + } else { + argv = 0; + } } - if (touch_flag && !(flags & COMMANDS_RECURSE)) - { - /* Go on to the next command. It might be the recursive one. - We construct ARGV only to find the end of the command line. */ + if (argv && touch_flag) { + if (!(flags & COMMANDS_RECURSE)) { + /* Go on to the next command. It might be the recursive one. + We construct ARGV only to find the end of the command line. */ #ifndef VMS - if (argv) - { - free (argv[0]); - free ((char *) argv); - } + if (argv) { + free (argv[0]); + free ((char *) argv); + } #endif - argv = 0; + argv = 0; + } else { + /* insert a non-recursave version of the current command next on + the command list so that all the proper non-recursave stuff + happens. This fixes a signifigant bug where if all the commands + for a given target were recursave "make -t" would not touch the + target! + */ + struct child *nk = malloc(sizeof(struct child)); + *nk = *child; + char *cp = saved_cmd_ptr; + while(*cp == '-' || *cp == '+' || *cp == '@') { + fprintf(stderr, "cp %p %c\n", cp, *cp); + cp++; + } + nk->command_ptr = cp; + child->next = nk; + nk->file->cmds->lines_flags[nk->command_line - 1] &= ~COMMANDS_RECURSE; } + } if (argv == 0) { @@ -1072,7 +1102,9 @@ /* No more commands. Make sure we're "running"; we might not be if (e.g.) all commands were skipped due to -n. */ set_command_state (child->file, cs_running); - child->file->update_status = 0; + if (!already_set_status) { + child->file->update_status = 0; + } notice_finished_file (child->file); } return; @@ -1107,8 +1139,16 @@ #else (argv[0] && !strcmp (argv[0], "/bin/sh")) #endif +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + /* allow either -ec or -c */ + && ((argv[1] + && argv[1][0] == '-' && argv[1][1] == 'c' && argv[1][2] == '\0') || + (argv[1] + && argv[1][0] == '-' && argv[1][1] == 'e' && argv[1][2] == 'c' && argv[1][3] == '\0')) +#else && (argv[1] && argv[1][0] == '-' && argv[1][1] == 'c' && argv[1][2] == '\0') +#endif __APPLE__ || NeXT || NeXT_PDO && (argv[2] && argv[2][0] == ':' && argv[2][1] == '\0') && argv[3] == NULL) { @@ -1258,6 +1298,42 @@ #else /* !__EMX__ */ +#if USE_POSIX_SPAWN + posix_spawn_file_actions_t file_actions; + posix_spawnattr_t attr; + sigset_t nosigs, allsigs; + int rc; + struct stat stat; + short spawn_flags = 0; + + posix_spawn_file_actions_init(&file_actions); + if (!(flags & COMMANDS_RECURSE)) { + if (job_fds[0] >= 0 && fstat(job_fds[0], &stat)) + posix_spawn_file_actions_addclose(&file_actions, job_fds[0]); + if (job_fds[1] >= 0 && fstat(job_fds[1], &stat)) + posix_spawn_file_actions_addclose(&file_actions, job_fds[1]); + } + if (job_rfd >= 0 && fstat(job_rfd, &stat)) + posix_spawn_file_actions_addclose(&file_actions, job_rfd); + if (!child->good_stdin && fstat(bad_stdin, &stat)) + posix_spawn_file_actions_adddup2(&file_actions, bad_stdin, 0); + posix_spawnattr_init(&attr); + sigemptyset(&nosigs); + sigfillset(&allsigs); + posix_spawnattr_setsigmask(&attr, &nosigs); + posix_spawnattr_setsigdefault(&attr, &allsigs); + posix_spawnattr_getflags(&attr, &spawn_flags); + spawn_flags |= POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK; + posix_spawnattr_setflags(&attr, spawn_flags); + rc = posix_spawnp(&child->pid, argv[0], &file_actions, &attr, argv, child->environment); + environ = parent_environ; + posix_spawnattr_destroy(&attr); + posix_spawn_file_actions_destroy(&file_actions); + if (rc) { + error (NILF, _("%s: %s"), argv[0], strerror(rc)); + rc = posix_spawnp(&child->pid, "/usr/bin/false", NULL, NULL, NULL, NULL); + } +#else /* !USE_POSIX_SPAWN */ child->pid = vfork (); environ = parent_environ; /* Restore value child may have clobbered. */ if (child->pid == 0) @@ -1285,6 +1361,7 @@ perror_with_name ("vfork", ""); goto error; } +# endif /* !USE_POSIX_SPAWN */ # endif /* !__EMX__ */ #endif /* !VMS */ } @@ -1601,6 +1678,19 @@ file); } +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) /* for NEXT_VPATH_FLAG support */ + if (next_flag & NEXT_VPATH_FLAG) { + for (i = 0; i < cmds->ncommand_lines; ++i) { + char *line; + if (lines[i] != 0) { + line = allocated_vpath_expand_for_file (lines[i], file); + free (lines[i]); + lines[i] = line; + } + } + } +#endif /* __APPLE__ || NeXT || NeXT_PDO */ + /* Start the command sequence, record it in a new `struct child', and add that to the chain. */ @@ -2423,23 +2513,7 @@ } else if (*p == '\\' && p[1] == '\n') { - /* Backslash-newline is handled differently depending on what - kind of string we're in: inside single-quoted strings you - keep them; in double-quoted strings they disappear. - For DOS/Windows/OS2, if we don't have a POSIX shell, - we keep the pre-POSIX behavior of removing the - backslash-newline. */ - if (instring == '"' -#if defined (__MSDOS__) || defined (__EMX__) || defined (WINDOWS32) - || !unixy_shell -#endif - ) ++p; - else - { - *(ap++) = *(p++); - *(ap++) = *p; - } /* If there's a TAB here, skip it. */ if (p[1] == '\t') ++p; @@ -2690,15 +2764,33 @@ argument list. */ unsigned int shell_len = strlen (shell); +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + char *minus_c; + int minus_c_len; + + if (next_flag & NEXT_ERREXIT_FLAG) { + minus_c = " -ec "; + minus_c_len = 5; + } else { + minus_c = " -c "; + minus_c_len = 4; + } +#else #ifndef VMS static char minus_c[] = " -c "; #else static char minus_c[] = ""; #endif +#endif /* __APPLE__ || NeXT || NeXT_PDO */ unsigned int line_len = strlen (line); +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) + char *new_line = (char *) alloca (shell_len + minus_c_len + + (line_len * 2) + 1); +#else char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1) + (line_len * 2) + 1); +#endif /* __APPLE__ || NeXT || NeXT_PDO */ char *command_ptr = NULL; /* used for batch_mode_shell mode */ # ifdef __EMX__ /* is this necessary? */ @@ -2709,8 +2801,13 @@ ap = new_line; bcopy (shell, ap, shell_len); ap += shell_len; +#ifdef __APPLE__ + bcopy (minus_c, ap, minus_c_len); + ap += minus_c_len; +#else /* !__APPLE__ */ bcopy (minus_c, ap, sizeof (minus_c) - 1); ap += sizeof (minus_c) - 1; +#endif /* __APPLE__ */ command_ptr = ap; for (p = line; *p != '\0'; ++p) { @@ -2721,22 +2818,6 @@ } else if (*p == '\\' && p[1] == '\n') { - /* POSIX says we keep the backslash-newline, but throw out - the next char if it's a TAB. If we don't have a POSIX - shell on DOS/Windows/OS2, mimic the pre-POSIX behavior - and remove the backslash/newline. */ -#if defined (__MSDOS__) || defined (__EMX__) || defined (WINDOWS32) -# define PRESERVE_BSNL unixy_shell -#else -# define PRESERVE_BSNL 1 -#endif - if (PRESERVE_BSNL) - { - *(ap++) = '\\'; - *(ap++) = '\\'; - *(ap++) = '\n'; - } - ++p; if (p[1] == '\t') ++p; @@ -2761,7 +2842,7 @@ #endif *ap++ = *p; } - if (ap == new_line + shell_len + sizeof (minus_c) - 1) + if (ap == new_line + shell_len + minus_c_len) /* Line was empty. */ return 0; *ap = '\0'; diff -ru make-3.81/main.c gnumake-130/main.c --- make-3.81/main.c 2006-03-19 18:36:37.000000000 -0800 +++ gnumake-130/main.c 2011-12-22 12:02:13.000000000 -0800 @@ -90,6 +90,27 @@ static char *quote_for_env PARAMS ((char *out, char *in)); static void initialize_global_hash_tables PARAMS ((void)); +#if defined(__APPLE__) || defined(NeXT) || defined(NeXT_PDO) +/* + * The various Apple, NeXT, and NeXT PDO hacks are no longer enabled by + * default, so that default behaves matches GNU make. + * + * The hacks can be enabled selectively enabling the following options. + * They can be enabled by setting the variable USE_APPLE_PB_SUPPORT to one + * or more of the options, or by specify "-N