diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-16 14:29:41 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-07-16 14:29:41 (GMT) |
| commit | fef76ed094cfdd328487c4ad6434327ac90c9997 (patch) | |
| tree | 451147b0730b2df9a75d027422a2587668df0264 /src/qtbase.mk | |
| parent | f88bbe7ffd06b3b90d9d50c3bb37b3de31aeac75 (diff) | |
| download | mxe-fef76ed094cfdd328487c4ad6434327ac90c9997.zip mxe-fef76ed094cfdd328487c4ad6434327ac90c9997.tar.gz mxe-fef76ed094cfdd328487c4ad6434327ac90c9997.tar.bz2 | |
qtbase: fix pkgconfig files and enable debug variants
fixes #1316
Diffstat (limited to 'src/qtbase.mk')
| -rw-r--r-- | src/qtbase.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qtbase.mk b/src/qtbase.mk index 7267785..0904373 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -58,19 +58,18 @@ define $(PKG)_BUILD -system-pcre \ -openssl-linked \ -dbus-linked \ - -v + -v \ + $($(PKG)_CONFIGURE_OPTS) - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - $(MAKE) -C '$(1)' -j '$(JOBS)' QMAKE="$(1)/bin/qmake CONFIG-='debug debug_and_release'" + $(MAKE) -C '$(1)' -j '$(JOBS)' rm -rf '$(PREFIX)/$(TARGET)/qt5' $(MAKE) -C '$(1)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5 mkdir '$(1)/test-qt' cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' - $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' - $(INSTALL) -m755 '$(1)/test-qt/release/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE) + $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' # build test the manual way mkdir '$(1)/test-$(PKG)-pkgconfig' @@ -87,7 +86,7 @@ define $(PKG)_BUILD '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \ -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ -I'$(1)/test-$(PKG)-pkgconfig' \ - `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs` + `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs` # setup cmake toolchain echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' |