diff options
Diffstat (limited to 'package/qt5/qt5base')
| -rw-r--r-- | package/qt5/qt5base/0009-fix-build-with-ccache.patch | 49 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 12 |
2 files changed, 52 insertions, 9 deletions
diff --git a/package/qt5/qt5base/0009-fix-build-with-ccache.patch b/package/qt5/qt5base/0009-fix-build-with-ccache.patch new file mode 100644 index 0000000000..896c0efb06 --- /dev/null +++ b/package/qt5/qt5base/0009-fix-build-with-ccache.patch @@ -0,0 +1,49 @@ +Fix QMAKE_CXX/CROSS_COMPILE verification with ccache + +The use of ccache leads to QMAKE_CXX definitions of the form: + + QMAKE_CXX = $${CCACHE} $${CROSS_COMPILE}g++ + +The previous test required QMAKE_CXX to be a single valid (absolute or +QMAKE_PATH_ENV-relative) path to an existing file, which was not +compatible with definitions of QMAKE_CXX like the one above. + +Fix this by using only the first value in QMAKE_CXX, which usually +points to the compiler executable, or to the ccache executable in the +above case. + +Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com> +--- + mkspecs/features/device_config.prf | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf +index cd3a0cf..eee4ac6 100644 +--- a/mkspecs/features/device_config.prf ++++ b/mkspecs/features/device_config.prf +@@ -19,10 +19,15 @@ defineTest(deviceSanityCheckCompiler) { + else: \ + sfx = + ++ # Build the compiler filename using the first value in QMAKE_CXX in order to ++ # support tools like ccache, which give QMAKE_CXX values of the form: ++ # ccache <path_to_compiler> ++ compiler = $$first(QMAKE_CXX)$$sfx ++ + # Check if the binary exists with an absolute path. Do this check + # before the CROSS_COMPILE empty check below to allow the mkspec + # to derive the compiler path from other device options. +- exists($$QMAKE_CXX$$sfx):return() ++ exists($$compiler):return() + + # Check for possible reasons of failure + # check if CROSS_COMPILE device-option is set +@@ -31,7 +36,7 @@ defineTest(deviceSanityCheckCompiler) { + # Check if QMAKE_CXX points to an executable. + ensurePathEnv() + for (dir, QMAKE_PATH_ENV) { +- exists($$dir/$${QMAKE_CXX}$$sfx): \ ++ exists($$dir/$${compiler}): \ + return() + } + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 753b0696f5..e783b4d42e 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -26,7 +26,8 @@ QT5BASE_CONFIGURE_OPTS += \ -no-iconv \ -system-zlib \ -system-pcre \ - -no-pch + -no-pch \ + -shared ifeq ($(BR2_ENABLE_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug @@ -34,14 +35,6 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -ifeq ($(BR2_STATIC_LIBS),y) -QT5BASE_CONFIGURE_OPTS += -static -else -# We apparently can't build both the shared and static variants of the -# library. -QT5BASE_CONFIGURE_OPTS += -shared -endif - QT5BASE_CONFIGURE_OPTS += -largefile ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) @@ -156,6 +149,7 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) ex # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql |
