diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2015-10-18 12:04:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-10-18 19:09:17 (GMT) |
| commit | 4aca056a3091af4fdc473ad98e5f669f76a83c73 (patch) | |
| tree | 5d14adc86d30d9ad20ef9300d92bf3f85ab29065 /src | |
| parent | 4cb95b14f3db2f8e6cb1b383dcae8be455d0809b (diff) | |
| download | mxe-4aca056a3091af4fdc473ad98e5f669f76a83c73.zip mxe-4aca056a3091af4fdc473ad98e5f669f76a83c73.tar.gz mxe-4aca056a3091af4fdc473ad98e5f669f76a83c73.tar.bz2 | |
qtbase: fix log corruption with many zero bytes
close #938
Diffstat (limited to 'src')
| -rw-r--r-- | src/qtbase-1.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/qtbase-1.patch b/src/qtbase-1.patch index a7d93fb..3b7e3f1 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1.patch @@ -123,3 +123,36 @@ index 3cfb614..8b7063f 100644 -- 2.1.4 + +From 86c642254077b561ae7442c06cd8d1a3f87669f4 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sun, 18 Oct 2015 13:43:29 +0200 +Subject: [PATCH] configure: fix log corruption with many zero bytes + +If tty=/dev/stderr, then "tee $tty" breaks log on some +systems. Workaround is to use tty=some-file and cat that +file afterwords. The file has the following variables: + +DEFAULT_INCDIRS=... +DEFAULT_LIBDIRS=... + +see https://github.com/mxe/mxe/issues/938 + +diff --git a/configure b/configure +index eb432b5..0bd511e 100755 +--- a/configure ++++ b/configure +@@ -3559,8 +3559,9 @@ END { + }' + + unset tty +-[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr ++[ "$OPT_VERBOSE" = "yes" ] && tty=awkoutput.tmp + eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" ++[ "$OPT_VERBOSE" = "yes" ] && cat awkoutput.tmp && rm awkoutput.tmp + unset tty + + #setup the build parts +-- +1.7.10.4 + |