diff options
-rw-r--r-- | src/qt3d.mk | 5 | ||||
-rw-r--r-- | src/qtactiveqt.mk | 5 | ||||
-rw-r--r-- | src/qtconnectivity.mk | 5 | ||||
-rw-r--r-- | src/qtdeclarative.mk | 5 | ||||
-rw-r--r-- | src/qtenginio.mk | 5 | ||||
-rw-r--r-- | src/qtgraphicaleffects.mk | 5 | ||||
-rw-r--r-- | src/qtimageformats.mk | 5 | ||||
-rw-r--r-- | src/qtlocation.mk | 5 | ||||
-rw-r--r-- | src/qtmultimedia.mk | 5 | ||||
-rw-r--r-- | src/qtquick1.mk | 5 | ||||
-rw-r--r-- | src/qtquickcontrols.mk | 5 | ||||
-rw-r--r-- | src/qtscript.mk | 5 | ||||
-rw-r--r-- | src/qtsensors.mk | 5 | ||||
-rw-r--r-- | src/qtserialport.mk | 5 | ||||
-rw-r--r-- | src/qtservice.mk | 5 | ||||
-rw-r--r-- | src/qtsvg.mk | 5 | ||||
-rw-r--r-- | src/qtsystems.mk | 5 | ||||
-rw-r--r-- | src/qtwebchannel.mk | 5 | ||||
-rw-r--r-- | src/qtwebengine.mk | 5 | ||||
-rw-r--r-- | src/qtwebkit.mk | 5 | ||||
-rw-r--r-- | src/qtwebsockets.mk | 5 | ||||
-rw-r--r-- | src/qtwinextras.mk | 5 | ||||
-rw-r--r-- | src/qtxlsxwriter.mk | 5 | ||||
-rw-r--r-- | src/qtxmlpatterns.mk | 5 |
24 files changed, 72 insertions, 48 deletions
diff --git a/src/qt3d.mk b/src/qt3d.mk index ab6c767..c7856d8 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -12,8 +12,9 @@ $(PKG)_DEPS := gcc qtbase qtdeclarative $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, qtproject/qt3d, master) define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG+=git_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+=git_build CONFIG-='debug debug_and_release' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 4996f05..22b297a 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 3f7b6b6..759e7ad 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index 58320bd..6b9b8b6 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtenginio.mk b/src/qtenginio.mk index 23c9856..4c6c19a 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index ccf1365..cdd86f2 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 0e520c2..50aaf0e 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtlocation.mk b/src/qtlocation.mk index a9cf45d..b48892a 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index 6805e52..c2f1fb1 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtquick1.mk b/src/qtquick1.mk index 87c36c1..1f91be1 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index b31c860..cf97369 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtscript.mk b/src/qtscript.mk index 42ced7d..a808e65 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtsensors.mk b/src/qtsensors.mk index 271e126..40f480d 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtserialport.mk b/src/qtserialport.mk index d1e6700..a9a2287 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtservice.mk b/src/qtservice.mk index 085b89e..870c2a3 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -16,8 +16,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(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 1ea3b72..28828fd 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 88339a8..aecbfac 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -17,8 +17,9 @@ endef define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/syncqt.pl' -version 5.4.0 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index e7c6631..9b4ba58 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index 3787ffc..42e9afc 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 2597717..c4e1e77 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -17,8 +17,9 @@ 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' - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex + # 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' FLEX=flex CONFIG-='debug debug_and_release' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index 2f08143..b616d98 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index a01cce6..949a335 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtxlsxwriter.mk b/src/qtxlsxwriter.mk index 44bf3f7..08f2539 100644 --- a/src/qtxlsxwriter.mk +++ b/src/qtxlsxwriter.mk @@ -12,8 +12,9 @@ $(PKG)_DEPS := gcc qtbase $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, dbzhang800/QtXlsxWriter, master) define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 93506f6..495c9db 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -15,8 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + # 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' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - |