diff options
| author | Joerg Koenig <jck@gmx.org> | 2019-07-14 21:16:01 (GMT) |
|---|---|---|
| committer | Joerg Koenig <jck@gmx.org> | 2019-07-14 21:16:01 (GMT) |
| commit | 4fbe1b426e6f27fbcf0654462eba6fecaec8378f (patch) | |
| tree | 0a197bb70211008d2a88c8cef4c60535625030c0 | |
| parent | 649363e9787f5aa1ae882d1bc3c6fef500bea05c (diff) | |
| download | Qt-4fbe1b426e6f27fbcf0654462eba6fecaec8378f.zip Qt-4fbe1b426e6f27fbcf0654462eba6fecaec8378f.tar.gz Qt-4fbe1b426e6f27fbcf0654462eba6fecaec8378f.tar.bz2 | |
Added patch for false-positive on deprecated-copy warningsrefs/changes/26/8226/1
GCC 9 produce a lot of false-positive warnings when comiling with QT.
This patch disables this warnings.
Resolves: :jira:<issue>
See also: :jira:<issue>
Change-Id: Iba96885d080df398205944a2252a540f96883894
| -rw-r--r-- | Makefile.mingw64 | 1 | ||||
| -rw-r--r-- | Makefile.x86-linux | 61 |
2 files changed, 32 insertions, 30 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index 3b6018f..9115047 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -50,6 +50,7 @@ qt.$(ARCH): tar --force-local -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz; \ cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ; \ patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch ; \ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-gcc9-deprecated-copy.patch ; \ fi rm -Rf $(QT_SRC_PATH) mv $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) $(QT_SRC_PATH) diff --git a/Makefile.x86-linux b/Makefile.x86-linux index b3f2856..158330f 100644 --- a/Makefile.x86-linux +++ b/Makefile.x86-linux @@ -74,36 +74,37 @@ qt.x86-linux.shared: cd $(LOCAL_BUILD_PATH) && \ tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \ - rm -f config.cache && \ - export LDFLAGS=$(CXX_LDFLAGS) && \ - export PATH=$(GCC_PATH)/bin:$(PATH) && \ - export LD_LIBRARY_PATH=$(GCC_PATH)/lib:$(LD_LIBRARY_PATH) && \ - gcc --version && \ - bash ./configure \ - -recheck-all \ - -shared \ - -prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \ - -release \ - -opensource \ - -strip \ - -ssl \ - -openssl \ - -I$(LOCAL_INST_PATH)/openssl/include \ - -L$(LOCAL_INST_PATH)/openssl/lib \ - -L$(GCC_PATH)/lib \ - -nomake examples \ - -nomake tests \ - -skip qtwebengine \ - -qt-zlib \ - -qt-libjpeg \ - -qt-libpng \ - -qt-pcre \ - -qt-xcb \ - -fontconfig \ - -system-freetype \ - -confirm-license && \ - make -j$(JOBS) && \ - make -j$(JOBS) install + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-gcc9-deprecated-copy.patch && \ + rm -f config.cache && \ + export LDFLAGS=$(CXX_LDFLAGS) && \ + export PATH=$(GCC_PATH)/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(GCC_PATH)/lib:$(LD_LIBRARY_PATH) && \ + gcc --version && \ + bash ./configure \ + -recheck-all \ + -shared \ + -prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \ + -release \ + -opensource \ + -strip \ + -ssl \ + -openssl \ + -I$(LOCAL_INST_PATH)/openssl/include \ + -L$(LOCAL_INST_PATH)/openssl/lib \ + -L$(GCC_PATH)/lib \ + -nomake examples \ + -nomake tests \ + -skip qtwebengine \ + -qt-zlib \ + -qt-libjpeg \ + -qt-libpng \ + -qt-pcre \ + -qt-xcb \ + -fontconfig \ + -system-freetype \ + -confirm-license && \ + make -j$(JOBS) && \ + make -j$(JOBS) install cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./ |