summaryrefslogtreecommitdiffstats
path: root/src/qca.mk
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2019-05-15 20:21:56 (GMT)
committerMark Brand <mabrand@mabrand.nl>2019-05-15 21:13:34 (GMT)
commite247b7c5da34f0ec89cc0e61e2732b7407a78112 (patch)
tree5bd66d96fe515fb39b823fc153c7089d8f2b5794 /src/qca.mk
parent5855983070e939d59d25394404dbe9f7c5b92076 (diff)
downloadmxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.zip
mxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.tar.gz
mxe-e247b7c5da34f0ec89cc0e61e2732b7407a78112.tar.bz2
gcc9 compatibility: qca, qscintilla2
Diffstat (limited to 'src/qca.mk')
-rw-r--r--src/qca.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qca.mk b/src/qca.mk
index bef8d2b..652236c 100644
--- a/src/qca.mk
+++ b/src/qca.mk
@@ -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) \