Bug 469639 - failed to build firefox trunk on OpenSolaris; define HAVE_ALLOCA_H on Solaris; r=chris.double sr=roc
authorBoying Lu <brian.lu@sun.com>
Thu, 25 Dec 2008 12:30:21 +0100
changeset 23054 6af107f076c7dc1d4331eab1ddf57910e68bd402
parent 23053 5428595e217c8c1ea7a5c4386587e5ee1bba82a9
child 23055 a100873f37b700bf1cdd69c1ae0a1d78b4eaa03f
push idunknown
push userunknown
push dateunknown
reviewerschris.double, roc
bugs469639
milestone1.9.2a1pre
Bug 469639 - failed to build firefox trunk on OpenSolaris; define HAVE_ALLOCA_H on Solaris; r=chris.double sr=roc
media/libvorbis/README_MOZILLA
media/libvorbis/alloca.diff
media/libvorbis/lib/os.h
media/libvorbis/update.sh
--- a/media/libvorbis/README_MOZILLA
+++ b/media/libvorbis/README_MOZILLA
@@ -4,8 +4,10 @@ were those applied by update.sh and the 
 files for the Mozilla build system.
 
 Some files are renamed during the copy to prevent clashes with object
 file names with other Mozilla libraries.
 
 BUG 455372 - WinCE LibVorbis No FPU Support on WinMobile, removed FPU
 support for builds with WINCE defined.
 
+BUG 469639 - Failed to build firefox trunk on OpenSolaris
+
new file mode 100644
--- /dev/null
+++ b/media/libvorbis/alloca.diff
@@ -0,0 +1,14 @@
+diff -r f33a75da59bd media/libvorbis/lib/os.h
+--- a/media/libvorbis/lib/os.h	Sun Dec 07 19:31:40 2008 -0800
++++ b/media/libvorbis/lib/os.h	Mon Dec 15 16:26:36 2008 +0800
+@@ -25,6 +25,10 @@
+ #include <ogg/os_types.h>
+ 
+ #include "misc.h"
++
++#ifdef SOLARIS
++#define HAVE_ALLOCA_H
++#endif
+ 
+ #ifndef _V_IFDEFJAIL_H_
+ #  define _V_IFDEFJAIL_H_
--- a/media/libvorbis/lib/os.h
+++ b/media/libvorbis/lib/os.h
@@ -21,16 +21,20 @@
 #include "config.h"
 #endif
 
 #include <math.h>
 #include <ogg/os_types.h>
 
 #include "misc.h"
 
+#ifdef SOLARIS
+#define HAVE_ALLOCA_H
+#endif
+
 #ifndef _V_IFDEFJAIL_H_
 #  define _V_IFDEFJAIL_H_
 
 #  ifdef __GNUC__
 #    define STIN static __inline__
 #  elif _WIN32
 #    define STIN static __inline
 #  else
--- a/media/libvorbis/update.sh
+++ b/media/libvorbis/update.sh
@@ -41,8 +41,9 @@ cp $1/lib/registry.h ./lib/registry.h
 cp $1/lib/codebook.c ./lib/vorbis_codebook.c
 cp $1/lib/bitrate.c ./lib/vorbis_bitrate.c
 cp $1/lib/block.c ./lib/vorbis_block.c
 cp $1/include/vorbis/codec.h ./include/vorbis/codec.h
 cp $1/todo.txt ./todo.txt
 cp $1/COPYING ./COPYING
 cp $1/README ./README
 cp $1/AUTHORS ./AUTHORS
+patch -p3 < ./alloca.diff