Bug 1075758 - Use a larger buffer in pkgdata, corresponding to Mozilla's inordinately-long compiler command. r=m_kato

--HG--
extra : rebase_source : 8b394e0adb87164f1c45f9bf6cb7f7c911c3b32b
This commit is contained in:
Jeff Walden 2015-06-14 22:47:37 -07:00
parent 73ca79d7ee
commit 893125d2f1
3 changed files with 24 additions and 1 deletions

View File

@ -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);
}

View File

@ -2171,7 +2171,7 @@ static void pkg_createOptMatchArch(char *optMatchArch) {
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,

View File

@ -52,5 +52,6 @@ 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}