diff options
| author | Fatih Aşıcı <fatih.asici@gmail.com> | 2013-11-20 14:17:41 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-11-28 23:05:29 +0100 |
| commit | 86db2a76e2f07d003464d5e0383d3ea437dc47d9 (patch) | |
| tree | 29b5faf8d7ae4f97ad86e37e26148142e1857df9 /package/qt5/qt5base/qt5base.mk | |
| parent | 571fd2ce74668b4feda2f669a4a406a86f210f1c (diff) | |
| download | buildroot-86db2a76e2f07d003464d5e0383d3ea437dc47d9.tar.gz buildroot-86db2a76e2f07d003464d5e0383d3ea437dc47d9.zip | |
qt5base: use -device-option to set mkspec variables
Simplify our custom qmake.conf:
- Include linux_device_{pre,post}.conf to inherit common device
configuration.
- Do not add $(STAGING_DIR)/usr/include to include path. It is
redundant.
In additon to the simplification of code, this change is a preparation
to solve problems occurring when QMAKE_CXX is prepended with ccache path.
Upstream patch is needed by configure to parse device options correctly.
Another upstream patch is needed to remove ARM specific parts from
linux_device_post.conf.
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base.mk')
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ce78d31256..febdc9b71c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -152,21 +152,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus -# Ideally, we could use -device-option to substitute variable values -# in our linux-buildroot-g++/qmake.config, but this mechanism doesn't -# nicely support variable values that contain spaces. So we use the -# good old sed solution here. -define QT5BASE_CONFIG_SET - $(SED) 's%^$(1).*%$(1) = $(2)%g' $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf -endef - define QT5BASE_CONFIGURE_CMDS - $(call QT5BASE_CONFIG_SET,BUILDROOT_CROSS_COMPILE,$(TARGET_CROSS)) - $(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CFLAGS,$(TARGET_CFLAGS)) - $(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS)) - $(call QT5BASE_CONFIG_SET,BUILDROOT_INCLUDE_PATH,$(STAGING_DIR)/usr/include) - $(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \ - $(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)) (cd $(@D); \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ @@ -181,6 +167,10 @@ define QT5BASE_CONFIGURE_CMDS -no-rpath \ -nomake examples -nomake tests \ -device buildroot \ + -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ + -device-option BUILDROOT_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \ + -device-option BUILDROOT_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \ -no-c++11 \ $(QT5BASE_CONFIGURE_OPTS) \ ) |
