diff options
34 files changed, 34 insertions, 102 deletions
diff --git a/src/qt3d.mk b/src/qt3d.mk index 1a4efa9..c21c2ae 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index f17803f..4842adc 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index cb20086..f96367b 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtcharts.mk b/src/qtcharts.mk index c80d1e7..2c27ae0 100644 --- a/src/qtcharts.mk +++ b/src/qtcharts.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index b946671..e211411 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtdatavis3d.mk b/src/qtdatavis3d.mk index ed8d77e..7276e41 100644 --- a/src/qtdatavis3d.mk +++ b/src/qtdatavis3d.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtdeclarative-render2d.mk b/src/qtdeclarative-render2d.mk index 0469cc0..6f2d322 100644 --- a/src/qtdeclarative-render2d.mk +++ b/src/qtdeclarative-render2d.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index bb686a6..0058a69 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtgamepad.mk b/src/qtgamepad.mk index 892f408..c704fc6 100644 --- a/src/qtgamepad.mk +++ b/src/qtgamepad.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 18d1365..152eae8 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 0e867d5..8c7564f 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtlocation.mk b/src/qtlocation.mk index b7a87f5..41fe4c6 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index ab43590..45b2fa6 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtofficeopenxml.mk b/src/qtofficeopenxml.mk index efc2b4e..6ae72c4 100644 --- a/src/qtofficeopenxml.mk +++ b/src/qtofficeopenxml.mk @@ -12,9 +12,7 @@ $(PKG)_DEPS := gcc qtbase $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, dbzhang800/QtOfficeOpenXml, master) define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtpurchasing.mk b/src/qtpurchasing.mk index 62d5850..bb6012a 100644 --- a/src/qtpurchasing.mk +++ b/src/qtpurchasing.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 4f87010..0956129 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtquickcontrols2.mk b/src/qtquickcontrols2.mk index c004abf..0a00fe1 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtscript.mk b/src/qtscript.mk index 5632e0b..0a169fd 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtscxml.mk b/src/qtscxml.mk index ad0f6b1..0086894 100644 --- a/src/qtscxml.mk +++ b/src/qtscxml.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtsensors.mk b/src/qtsensors.mk index f5ec184..5db51a7 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtserialbus.mk b/src/qtserialbus.mk index 602d0b9..a1094e7 100644 --- a/src/qtserialbus.mk +++ b/src/qtserialbus.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtserialport.mk b/src/qtserialport.mk index eeef50e..472bb60 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtservice.mk b/src/qtservice.mk index 972b087..f0971bc 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)/qtservice/buildlib' -j '$(JOBS)' $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install endef diff --git a/src/qtsvg.mk b/src/qtsvg.mk index f59511c..52db43e 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtsystems.mk b/src/qtsystems.mk index aff7bb1..2a71a86 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -16,9 +16,7 @@ endef define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/syncqt.pl' -version 5.4.0 - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtvirtualkeyboard.mk b/src/qtvirtualkeyboard.mk index dbb0289..ba39c4b 100644 --- a/src/qtvirtualkeyboard.mk +++ b/src/qtvirtualkeyboard.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index 045874d..c9360f3 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index f21db08..01a01c7 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 22e4e28..621df85 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -17,9 +17,7 @@ endef define $(PKG)_BUILD_SHARED # looks for build tools with .exe suffix and tries to use win_flex $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex CONFIG-='debug debug_and_release' + cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index a087ec9..1507c59 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwebview.mk b/src/qtwebview.mk index 78efc17..e5f8d8c 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 13a69d7..ea26d57 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtxlsxwriter.mk b/src/qtxlsxwriter.mk index 2da012c..cc1fed4 100644 --- a/src/qtxlsxwriter.mk +++ b/src/qtxlsxwriter.mk @@ -12,9 +12,7 @@ $(PKG)_DEPS := gcc qtbase $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, dbzhang800/QtXlsxWriter, master) define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index dc5b6af..38d8ab0 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -15,9 +15,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef |