diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-08-25 10:10:33 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-08-25 10:10:33 (GMT) |
| commit | 9cd1a9b6de8dd42ac8256883fbe2188cc7f4ba59 (patch) | |
| tree | b14107297f20c39bd0d78bf739ebe4aea0d0dd8b /src | |
| parent | 6ab49b639eb9514fd2fd0937ce2146479db43bdf (diff) | |
| parent | b30e9d419af926c2623844edb0e05f74482a8f0e (diff) | |
| download | mxe-9cd1a9b6de8dd42ac8256883fbe2188cc7f4ba59.zip mxe-9cd1a9b6de8dd42ac8256883fbe2188cc7f4ba59.tar.gz mxe-9cd1a9b6de8dd42ac8256883fbe2188cc7f4ba59.tar.bz2 | |
Merge pull request #220 from tonytheodore/qt-pkgconfig
packages qt qtbase: install pkgconfig files in standard location
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt.mk | 12 | ||||
| -rw-r--r-- | src/qtbase.mk | 16 |
2 files changed, 27 insertions, 1 deletions
@@ -84,4 +84,16 @@ define $(PKG)_BUILD cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/$(2).pro' $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(PREFIX)/$(TARGET)/bin/' + + # copy pkg-config files to standard directory + cp '$(PREFIX)/$(TARGET)'/qt/lib/pkgconfig/* '$(PREFIX)/$(TARGET)'/lib/pkgconfig/ + + # build test the manual way + mkdir '$(1)/test-$(PKG)-pkgconfig' + '$(PREFIX)/$(TARGET)/qt/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui' + '$(TARGET)-g++' \ + -W -Wall -Werror -std=c++0x -pedantic \ + '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + `'$(TARGET)-pkg-config' QtGui --cflags --libs` endef diff --git a/src/qtbase.mk b/src/qtbase.mk index 78198f3..d85b82b 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -51,7 +51,9 @@ define $(PKG)_BUILD -dbus-linked \ -v - $(MAKE) -C '$(1)' -j '$(JOBS)' + # 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'" rm -rf '$(PREFIX)/$(TARGET)/qt5' $(MAKE) -C '$(1)' -j 1 install @@ -59,4 +61,16 @@ define $(PKG)_BUILD 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/' + + # copy pkg-config files to standard directory + cp '$(PREFIX)/$(TARGET)'/qt5/lib/pkgconfig/* '$(PREFIX)/$(TARGET)'/lib/pkgconfig/ + + # build test the manual way + mkdir '$(1)/test-$(PKG)-pkgconfig' + '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui' + '$(TARGET)-g++' \ + -W -Wall -Werror -std=c++0x -pedantic \ + '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs` endef |