Commit 59f9709b authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

contrib: qt4: apply qt 4.8.0 patch

fix build with unmodified mingw32
(cherry picked from commit a2f19dcc)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 89def090
Remove me after qt4 4.8.0
--- qt-everywhere-opensource-src-4.7.4.orig/src/corelib/tools/qlocale.cpp 2012-01-19 23:34:18.000000000 +0100
+++ qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp 2012-01-19 23:37:41.000000000 +0100
@@ -6614,6 +6614,14 @@
* calculation.
*/
+#if defined(Q_OS_WIN) && defined (Q_CC_GNU) && !defined(_clear87) // See QTBUG-7576
+extern "C" {
+__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask);
+__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */
+# define _clear87 _clearfp
+}
+#endif
+
/* This actually sometimes returns a pointer to a string literal
cast to a char*. Do NOT try to modify the return value. */
...@@ -25,6 +25,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4 ...@@ -25,6 +25,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
patch -p0 < $(SRC)/qt4/styles.patch patch -p0 < $(SRC)/qt4/styles.patch
patch -p0 < $(SRC)/qt4/chroot.patch patch -p0 < $(SRC)/qt4/chroot.patch
patch -p0 < $(SRC)/qt4/imageformats.patch patch -p0 < $(SRC)/qt4/imageformats.patch
patch -p0 < $(SRC)/qt4/mingw32.patch
mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@ mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)" XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment