diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-26 13:26:05 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-26 13:26:05 (GMT) |
| commit | c6b16b7e4d20734f2ac2fa465badd1121b6a6738 (patch) | |
| tree | 3a338a67c56a8d6e835811bc1c4481eac7956f0e /SOURCE/mkspecs-static-runtimes.patch | |
| parent | 386a4c8a8170b57ec347fc516262ff496e113f5d (diff) | |
| download | Qt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.zip Qt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.tar.gz Qt-c6b16b7e4d20734f2ac2fa465badd1121b6a6738.tar.bz2 | |
Last stand from QT_5_14refs/changes/82/11082/1
Change-Id: If8cf86e542691fed458098021c042193c4679d14
Diffstat (limited to 'SOURCE/mkspecs-static-runtimes.patch')
| -rw-r--r-- | SOURCE/mkspecs-static-runtimes.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/SOURCE/mkspecs-static-runtimes.patch b/SOURCE/mkspecs-static-runtimes.patch new file mode 100644 index 0000000..9f5f94b --- /dev/null +++ b/SOURCE/mkspecs-static-runtimes.patch @@ -0,0 +1,35 @@ +diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf +--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf 2020-03-27 10:49:31.000000000 +0100 ++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf 2020-04-19 21:02:26.869710981 +0200 +@@ -9,7 +9,7 @@ + include(../common/linux.conf) + + QMAKE_CFLAGS = -m32 +-QMAKE_LFLAGS = -m32 ++QMAKE_LFLAGS = -m32 -static-libgcc -static-libstdc++ + + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) +diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf +--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf 2020-03-27 10:49:31.000000000 +0100 ++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf 2020-04-19 21:02:07.453758876 +0200 +@@ -12,7 +12,7 @@ + include(../common/linux.conf) + + QMAKE_CFLAGS = -m64 +-QMAKE_LFLAGS = -m64 ++QMAKE_LFLAGS = -m64 -static-libgcc -static-libstdc++ + + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) +diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf +--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf 2020-03-27 10:49:31.000000000 +0100 ++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf 2020-04-19 21:03:17.773585413 +0200 +@@ -15,6 +15,7 @@ + QMAKE_CC = $${CROSS_COMPILE}gcc + QMAKE_CFLAGS += -fno-keep-inline-dllexport + QMAKE_CFLAGS_WARN_ON += -Wextra ++QMAKE_LFLAGS += -static-libgcc -static-libstdc++ + + QMAKE_CXX = $${CROSS_COMPILE}g++ + QMAKE_CXXFLAGS += -fno-keep-inline-dllexport |