qt5/base: prepare for own mkspec file for taregt specific host builds

This is trying to address the following issue: We pass variables to
qmake which get appended to qmake specific vars in mkspecs/*/qmake.conf.
However projects might invoke qmake once again, however without passing
respective variables along.
We might need to consider hard-coding the flags inside qmake.conf.

diff --git a/frameworks/qt5/qmake.mk b/frameworks/qt5/qmake.mk
index 29ff6f54e8074025b67389f2f8d1e03751fa389e..a7bf490ac41a32e50e507644d92401896d68c0ec 100644 (file)
--- a/frameworks/qt5/qmake.mk
+++ b/frameworks/qt5/qmake.mk
@@ -37,7 +37,7 @@
 #    objects on the target platform. Tihs behaviour wasn't observed so far, however 
 #    one might use the QT_INSTALL_* variables for some weird reason during runtime.
 
-QMAKE_SPEC:=linux-g++
+QMAKE_SPEC:=linux-openwrt-host-g++
 QMAKE_XSPEC:=linux-openwrt-g++
 
 # for target builds

diff --git a/frameworks/qt5/qt5base/Makefile b/frameworks/qt5/qt5base/Makefile
index 9992f17ffe94dc9cf465142c67d987605c466006..9b1295c56b83c4e798d949b74ffce173c0008986 100644 (file)
--- a/frameworks/qt5/qt5base/Makefile
+++ b/frameworks/qt5/qt5base/Makefile
@@ -286,7 +286,7 @@ endef
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(CP) \
-               ./files/mkspecs/linux-openwrt-g++ \
+               ./files/mkspecs/* \
                $(PKG_BUILD_DIR)/mkspecs/
 endef
 
@@ -336,6 +336,7 @@ define Build/Configure
                        --strip=yes \
                        --shared=yes \
                        --framework=no \
+                       --platform=linux-openwrt-host-g++ \
                        --xplatform=linux-openwrt-g++ \
                        --reduce-exports=no \
                        --reduce-relocations=no \
@@ -513,6 +514,12 @@ define Build/InstallDev
        $(call Build/Install/Pkgconfigs,$(1))
        $(call Build/Install/Libs,$(1),*)
        $(call Build/Install/Plugins,$(1),*,*)
+
+       # sed -i \
+       #   -e "s|###TARGET_CFLAGS###||g" \
+       #   -e "s|###TARGET_CXXFLAGS###||g" \
+       #   -e "s|###TARGET_LDFLAGS###||g" \
+       #   $(STAGING_DIR)/host/share/qt5/mkspecs/linux-openwrt-host-g++/qmake.conf
 endef
 
 define Host/Install

diff --git a/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qmake.conf b/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qmake.conf
new file mode 100644 (file)
index 0000000..41d3fb8
--- /dev/null
+++ b/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qmake.conf
@@ -0,0 +1,18 @@
+#
+# qmake configuration for building with linux-openwrt-g++
+#
+
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += incremental
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+# modifications to gcc-base.conf (included by gcc-base-unix.conf)
+QMAKE_CFLAGS   += ###TARGET_CFLAGS###
+QMAKE_CXXFLAGS += ###TARGET_CXXFLAGS###
+QMAKE_LFLAGS   += ###TARGET_LDFLAGS###
+
+load(qt_config)

diff --git a/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qplatformdefs.h b/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qplatformdefs.h
new file mode 100644 (file)
index 0000000..9cfed53
--- /dev/null
+++ b/frameworks/qt5/qt5base/files/mkspecs/linux-openwrt-host-g++/qplatformdefs.h
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"