diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-28 11:28:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-28 13:04:46 +0000 |
| commit | dd655ad0ae11bb4b44195baff93c15542f494ff9 (patch) | |
| tree | 8d6a3d4ae8fb2e48eaf50d09dadbe6e5cb59bbb7 /main/make/make-3.82-arg-list-length.patch | |
| parent | ced9eb976e2db4d16f30fa93150304c09286000f (diff) | |
| download | aports-dd655ad0ae11bb4b44195baff93c15542f494ff9.tar.bz2 aports-dd655ad0ae11bb4b44195baff93c15542f494ff9.tar.xz | |
main/make: patch for using insanely long command lines
Fixes build of webkitgtk.
Patch is from:
http://trac.webkit.org/browser/trunk/Tools/gtk/patches
Diffstat (limited to 'main/make/make-3.82-arg-list-length.patch')
| -rw-r--r-- | main/make/make-3.82-arg-list-length.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/main/make/make-3.82-arg-list-length.patch b/main/make/make-3.82-arg-list-length.patch new file mode 100644 index 0000000000..1b59da79eb --- /dev/null +++ b/main/make/make-3.82-arg-list-length.patch @@ -0,0 +1,89 @@ +diff -u make-3.82-orig/job.c make-3.82/job.c +--- make-3.82-orig/job.c 2010-07-24 10:27:50.000000000 +0200 ++++ make-3.82/job.c 2012-03-21 12:34:20.000000000 +0100 +@@ -29,6 +29,11 @@ + + #include <string.h> + ++//#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) ++#include <sys/user.h> ++#include <linux/binfmts.h> ++//#endif ++ + /* Default shell to use. */ + #ifdef WINDOWS32 + #include <windows.h> +@@ -2795,6 +2800,7 @@ + unsigned int sflags_len = strlen (shellflags); + char *command_ptr = NULL; /* used for batch_mode_shell mode */ + char *new_line; ++ char *args_ptr; + + # ifdef __EMX__ /* is this necessary? */ + if (!unixy_shell) +@@ -2865,8 +2871,17 @@ + return new_argv; + } + ++#ifdef MAX_ARG_STRLEN ++ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ "; ++#define ARG_NUMBER_DIGITS 5 ++#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \ ++ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2)) ++#else ++#define EVAL_LEN 0 ++#endif ++ + new_line = alloca (shell_len + 1 + sflags_len + 1 +- + (line_len*2) + 1); ++ + (line_len*2) + 1 + EVAL_LEN); + ap = new_line; + memcpy (ap, shell, shell_len); + ap += shell_len; +@@ -2875,6 +2890,30 @@ + ap += sflags_len; + *(ap++) = ' '; + command_ptr = ap; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN) ++ { ++ unsigned j; ++ memcpy (ap, eval_line, sizeof (eval_line) - 1); ++ ap += sizeof (eval_line) - 1; ++ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++) ++ ap += sprintf (ap, "\\$\\{%u\\}", j); ++ *ap++ = '\\'; ++ *ap++ = '"'; ++ *ap++ = ' '; ++ /* Copy only the first word of SHELL to $0. */ ++ for (p = shell; *p != '\0'; ++p) ++ { ++ if (isspace ((unsigned char)*p)) ++ break; ++ *ap++ = *p; ++ } ++ *ap++ = ' '; ++ } ++#endif ++ args_ptr = ap; ++ + for (p = line; *p != '\0'; ++p) + { + if (restp != NULL && *p == '\n') +@@ -2922,6 +2961,14 @@ + } + #endif + *ap++ = *p; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2)) ++ { ++ *ap++ = ' '; ++ args_ptr = ap; ++ } ++#endif + } + if (ap == new_line + shell_len + sflags_len + 2) + /* Line was empty. */ + |