Bug 1075758 - Use a larger buffer in pkgdata, corresponding to Mozilla's inordinately-long compiler command. r=m_kato
authorJeff Walden <jwalden@mit.edu>
Sun, 14 Jun 2015 22:47:37 -0700
changeset 250725 a6a57dc9a5a7cfcbe14af2a1b010e3708488e99b
parent 250724 b8ff9ab0b32dce4a05701a176ef7a1a45d8e796c
child 250726 319ea136708988111841508a5844b8d86cb8522d
push id61639
push userjwalden@mit.edu
push dateTue, 30 Jun 2015 17:18:40 +0000
treeherdermozilla-inbound@319ea1367089 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersm_kato
bugs1075758
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1075758 - Use a larger buffer in pkgdata, corresponding to Mozilla's inordinately-long compiler command. r=m_kato
intl/icu-patches/pkgdata-large-buffer.diff
intl/icu/source/tools/pkgdata/pkgdata.cpp
intl/update-icu.sh
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/pkgdata-large-buffer.diff
@@ -0,0 +1,22 @@
+diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
+--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
++++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
+@@ -2166,17 +2166,17 @@ static void pkg_createOptMatchArch(char 
+     const char* obj = "oma.obj";
+     FileStream* stream = NULL;
+ 
+     stream = T_FileStream_open(source,"w");
+     if (stream != NULL) {
+         T_FileStream_writeLine(stream, code);
+         T_FileStream_close(stream);
+ 
+-        char cmd[SMALL_BUFFER_MAX_SIZE];
++        char cmd[LARGE_BUFFER_MAX_SIZE];
+         sprintf(cmd, "%s %s -o %s",
+             pkgDataFlags[COMPILER],
+             source,
+             obj);
+ 
+         if (runCommand(cmd) == 0){
+             sprintf(optMatchArch, "%s", obj);
+         }
--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
+++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
@@ -2166,17 +2166,17 @@ static void pkg_createOptMatchArch(char 
     const char* obj = "oma.obj";
     FileStream* stream = NULL;
 
     stream = T_FileStream_open(source,"w");
     if (stream != NULL) {
         T_FileStream_writeLine(stream, code);
         T_FileStream_close(stream);
 
-        char cmd[SMALL_BUFFER_MAX_SIZE];
+        char cmd[LARGE_BUFFER_MAX_SIZE];
         sprintf(cmd, "%s %s -o %s",
             pkgDataFlags[COMPILER],
             source,
             obj);
 
         if (runCommand(cmd) == 0){
             sprintf(optMatchArch, "%s", obj);
         }
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -47,10 +47,11 @@ rm ${icu_dir}/source/data/translit/*
 # repository (not just the path within it we care about) receives a commit.
 # (This ensures that if ICU modifications are performed properly, it's always
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/pkgdata-large-buffer.diff
 
 hg addremove ${icu_dir}