mirror of https://git.wownero.com/dsc/mxe.git
qtbase: rebase patches
This commit is contained in:
Mark Brand
parent
8e7e506d28
commit
546151eb85
|
|
@ -4,7 +4,7 @@ See index.html for further information.
|
|||
From b4a1284aa84466a5c757e1efd16a694d128b1038 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 6 Aug 2015 23:35:08 +0200
|
||||
Subject: [PATCH 1/5] fix qwindows plugin linking with system-freetype (MXE
|
||||
Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE
|
||||
specific)
|
||||
|
||||
Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
|
||||
|
|
@ -26,7 +26,7 @@ index 39280de..e152b0d 100644
|
|||
From 217955a3e041e368857a696ebe8b512576d0cead Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 21 Jun 2014 13:12:49 +0200
|
||||
Subject: [PATCH 2/5] use pkg-config for harfbuzz (MXE specific)
|
||||
Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific)
|
||||
|
||||
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ index 7443368..c24e684 100644
|
|||
From 81c61f1cf8a2b8ea01545212081427eed0ab2950 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 8 Dec 2014 14:15:12 +0100
|
||||
Subject: [PATCH 3/5] fix oci config test on windows
|
||||
Subject: [PATCH 3/6] fix oci config test on windows
|
||||
|
||||
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ index 3ffda1d..39b6f3759 100644
|
|||
From b656a46abeecfa7ace2e08393b63412e74c62589 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 6 Aug 2015 13:24:56 +0200
|
||||
Subject: [PATCH 4/5] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
|
||||
Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
|
||||
|
||||
Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ index cea62fb..d6bbcd2 100755
|
|||
From ae120a60f2f31c911a451036ecd826b4486e2d3f Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 6 Oct 2015 09:53:20 +0200
|
||||
Subject: [PATCH 5/5] fix building mysql driver under mingw
|
||||
Subject: [PATCH 5/6] fix building mysql driver under mingw
|
||||
|
||||
Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
|
||||
|
||||
|
|
@ -124,35 +124,62 @@ index 3cfb614..8b7063f 100644
|
|||
2.1.4
|
||||
|
||||
|
||||
From 86c642254077b561ae7442c06cd8d1a3f87669f4 Mon Sep 17 00:00:00 2001
|
||||
From 9f47024d54abca4590fc1954015d14df40b23755 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
|
||||
Date: Sun, 18 Oct 2015 23:11:28 +0300
|
||||
Subject: [PATCH 6/6] configure: fix log corruption with option -v
|
||||
|
||||
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:
|
||||
This bug occurs if ./configure is called with -v on systems on
|
||||
which fd proc entries point to the files/devices they are open
|
||||
on instead of being magic nodes which would basically dup() the
|
||||
actual fds (e.g., Linux).
|
||||
|
||||
DEFAULT_INCDIRS=...
|
||||
DEFAULT_LIBDIRS=...
|
||||
In this case, the command "tee $tty" appends to /dev/stderr, which
|
||||
may be already opened by the parent process. This breaks the log file.
|
||||
|
||||
see https://github.com/mxe/mxe/issues/938
|
||||
Normally, the log file starts with
|
||||
|
||||
This is the Qt Open Source Edition.
|
||||
...
|
||||
|
||||
but with `-v` flag it would start with output of awkprog and maybe
|
||||
some zero bytes. Zero bytes are observed on Debian Wheezy.
|
||||
|
||||
DEFAULT_INCDIRS=...
|
||||
...
|
||||
^@^@^@^@^@^@^@^@^@^@^@^@...
|
||||
Done running configuration tests.
|
||||
...
|
||||
|
||||
To fix this problem, the output of `...` is saved to a variable, and
|
||||
then eval'd and echo'd (if -v).
|
||||
|
||||
This solution was found by Tony Theodore.
|
||||
https://github.com/mxe/mxe/issues/938#issuecomment-149770348
|
||||
|
||||
Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77
|
||||
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index eb432b5..0bd511e 100755
|
||||
index d6bbcd2..def691f 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3559,8 +3559,9 @@ END {
|
||||
@@ -3571,10 +3571,9 @@ END {
|
||||
print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n";
|
||||
}'
|
||||
|
||||
unset tty
|
||||
-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
|
||||
-eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`"
|
||||
-unset tty
|
||||
+awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"`
|
||||
+eval "$awkprog_result"
|
||||
+[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result"
|
||||
|
||||
#setup the build parts
|
||||
if [ -z "$CFG_BUILD_PARTS" ]; then
|
||||
--
|
||||
1.7.10.4
|
||||
2.1.4
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue