From dd655ad0ae11bb4b44195baff93c15542f494ff9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 28 Sep 2012 11:28:13 +0000
Subject: 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
---
 main/make/use-malloc.patch | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'main/make/use-malloc.patch')

diff --git a/main/make/use-malloc.patch b/main/make/use-malloc.patch
index 8e3284c03..dfda84c60 100644
--- a/main/make/use-malloc.patch
+++ b/main/make/use-malloc.patch
@@ -1,23 +1,17 @@
-Use malloc when construction the command argv instead of stack space.
-This fixes overflowing the stack when building webkit on uclibc based
-systems.
-
-https://savannah.gnu.org/bugs/index.php?36451
-
 --- ./job.c.orig
 +++ ./job.c
-@@ -2865,7 +2865,7 @@
- 	return new_argv;
-       }
+@@ -2880,7 +2880,7 @@
+ #define EVAL_LEN 0
+ #endif
  
 -    new_line = alloca (shell_len + 1 + sflags_len + 1
 +    new_line = xmalloc (shell_len + 1 + sflags_len + 1
-                              + (line_len*2) + 1);
+                        + (line_len*2) + 1 + EVAL_LEN);
      ap = new_line;
      memcpy (ap, shell, shell_len);
-@@ -2923,9 +2923,11 @@
+@@ -2970,9 +2970,11 @@
+ 	  }
  #endif
- 	*ap++ = *p;
        }
 -    if (ap == new_line + shell_len + sflags_len + 2)
 +    if (ap == new_line + shell_len + sflags_len + 2) {
@@ -28,7 +22,7 @@ https://savannah.gnu.org/bugs/index.php?36451
      *ap = '\0';
  
  #ifdef WINDOWS32
-@@ -3065,6 +3067,7 @@
+@@ -3112,6 +3114,7 @@
        fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
              __FILE__, __LINE__);
  #endif
-- 
cgit v1.2.3