From 7d04e40e29ae9412e385f6b6c9cf425cff30c31e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 2 Jun 2016 01:29:30 +1000 Subject: qt: symlink mkspecs/default On OSX, the default mkspec doesn't set `win32-g++` correctly. The following workarounds are possible: - set `QMAKESPEC` env var - use `-spec` command line option - set `CONFIG+=` - symlink mkspecs/default The internal build of qt always seems to use the `-spec` option, but that doesn't solve the default case - the symlink approach used on linux appears to always work. closes #1379 --- src/qt.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qt.mk b/src/qt.mk index 14198e7..d27214a 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -73,6 +73,13 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4 + # symlink mkspecs/default if it isn't already + # required on OSX to mimic linux installation + [[ -L '$(PREFIX)/$(TARGET)/qt/mkspecs/default' ]] || \ + rm -rf '$(PREFIX)/$(TARGET)/qt/mkspecs/default' && \ + ln -s '$(PREFIX)/$(TARGET)/qt/mkspecs/win32-g++-4.6' \ + '$(PREFIX)/$(TARGET)/qt/mkspecs/default' + # lrelease (from linguist) needed to prepare translation files $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install -- cgit v0.12