[vlc-commits] contrib: gettext: fix misassumption about alloca

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 10:59:11 2012 -0500| [31ae004cfa37828b2ca85c4621c2f4686fa9201c] | committer: Jean-Baptiste Kempf

contrib: gettext: fix misassumption about alloca
(cherry picked from commit 9e775fc6d67236e4dfef2f5928d2b5099e1f9466)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=31ae004cfa37828b2ca85c4621c2f4686fa9201c
---

 contrib/src/gettext/alloca.patch |   13 +++++++++++++
 contrib/src/gettext/rules.mak    |    1 +
 2 files changed, 14 insertions(+)

diff --git a/contrib/src/gettext/alloca.patch b/contrib/src/gettext/alloca.patch
new file mode 100644
index 0000000..bbb0f22
--- /dev/null
+++ b/contrib/src/gettext/alloca.patch
@@ -0,0 +1,13 @@
+    
+--- gettext/gettext-tools/libgrep/regex_internal.h.orig	2012-01-27 16:56:14.000000000 +0100
++++ gettext/gettext-tools/libgrep/regex_internal.h	2012-01-27 16:53:34.000000000 +0100
+@@ -455,7 +455,9 @@
+ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+ #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+ 
++#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
++#endif
+ 
+ #ifndef _LIBC
+ # if HAVE_ALLOCA
diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 032934b..4f1c1eb 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 	$(UNPACK)
+	$(APPLY) $(SRC)/gettext/alloca.patch
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/gettext/gettext-macosx.patch
 endif