openwrt-mirror/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2025-12-21 17:04:37 +04:00
Code Issues Packages Projects Releases Wiki Activity

use variables for calling qmake

Browse Source 
We need to distinguish as carefully as possible
between qmake for the host builds and qmake for
target builds
This commit is contained in:
Mirko Vogt
2017-02-21 19:16:52 +01:00
parent 2190867b24
commit c26c09e61b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frameworks/qt5base/files/qmake.mk
View File

@@ -74,18 +74,21 @@ HOST_INSTALL_DIR_ROOT:=$(HOST_INSTALL_DIR)
HOST_INSTALL_DIR:=$(HOST_INSTALL_DIR_ROOT)/$(STAGING_DIR_HOST)
#HOST_INSTALL_DIR:=$(HOST_INSTALL_DIR_ROOT)/$(STAGING_DIR)
QMAKE_TARGET=$(STAGING_DIR)/bin/qmake
QMAKE_HOST=$(STAGING_DIR_HOST)/bin/qmake
define Build/Configure/Default
TARGET_CROSS="$(TARGET_CROSS)" \
TARGET_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
TARGET_CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS)" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
qmake \
$(QMAKE_TARGET) \
-o $(PKG_BUILD_DIR)/$(MAKE_PATH)/Makefile \
$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(if $(1),$(1).pro,)
endef
define Host/Configure/Default
qmake_host \
$(QMAKE_HOST) \
-o $(HOST_BUILD_DIR)/$(MAKE_PATH)/Makefile \
$(HOST_BUILD_DIR)/$(MAKE_PATH)/$(if $(1),$(1).pro,)
endef
@@ -106,9 +109,6 @@ define Build/Compile/Default
endef
define Host/Compile/Default
+TARGET_CFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
TARGET_CXXFLAGS="$(HOST_CPPFLAGS) $(HOST_CXXFLAGS)" \
TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR)/$(MAKE_PATH) \
$(1)
endef