diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2019-05-15 20:21:56 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2019-05-15 21:13:34 (GMT) |
| commit | e247b7c5da34f0ec89cc0e61e2732b7407a78112 (patch) | |
| tree | 5bd66d96fe515fb39b823fc153c7089d8f2b5794 | |
| parent | 5855983070e939d59d25394404dbe9f7c5b92076 (diff) | |
| download | mxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.zip mxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.tar.gz mxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.tar.bz2 | |
gcc9 compatibility: qca, qscintilla2
| -rw-r--r-- | src/qca.mk | 6 | ||||
| -rw-r--r-- | src/qscintilla2.mk | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -22,7 +22,9 @@ define $(PKG)_BUILD # build test as qmake project mkdir '$(BUILD_DIR).test-qmake' - cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro' + cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \ + 'greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy' \ + '$(PWD)/src/qca-test.pro' $(MAKE) -C '$(BUILD_DIR).test-qmake' -j 1 $(INSTALL) -m755 '$(BUILD_DIR).test-qmake/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/' @@ -35,7 +37,7 @@ define $(PKG)_BUILD # build test manually '$(TARGET)-g++' \ - -W -Wall -Werror -std=gnu++11 \ + -W -Wall -Werror -std=gnu++11 -Wno-deprecated-copy \ '$(PWD)/src/qca-test.cpp' \ -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ $(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \ diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk index f028b6f..3de36f2 100644 --- a/src/qscintilla2.mk +++ b/src/qscintilla2.mk @@ -26,7 +26,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' install '$(TARGET)-g++' \ - -W -Wall -Werror -std=c++0x -pedantic \ + -W -Wall -Werror -std=c++0x -pedantic -Wno-deprecated-copy \ `'$(TARGET)-pkg-config' Qt5Widgets --cflags` \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2_qt5 \ `'$(TARGET)-pkg-config' Qt5Widgets --libs` |