diff mbox

[1/1] Added extra patch to qt5base package for fixing ccache related compile error with new QT 5.5

Message ID 1437907778-3734-1-git-send-email-jaap@jcz.nl
State Changes Requested
Headers show

Commit Message

Jaap Crezee July 26, 2015, 10:49 a.m. UTC
Signed-off-by: Jaap Crezee <jaap@jcz.nl>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/qt5/qt5base/0008-ccache_buildroot_fix.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-ccache_buildroot_fix.patch

Comments

Thomas Petazzoni July 28, 2015, 9:46 p.m. UTC | #1
Dear Jaap Crezee,

On Sun, 26 Jul 2015 12:49:38 +0200, Jaap Crezee wrote:
> Signed-off-by: Jaap Crezee <jaap@jcz.nl>
> Tested-by: Yegor Yefremov <yegorslists@googlemail.com>

An empty commit log is not acceptable. Also the commit title is too
long, and should follow the form:

	qt5base: <description>

> diff --git a/package/qt5/qt5base/0008-ccache_buildroot_fix.patch b/package/qt5/qt5base/0008-ccache_buildroot_fix.patch
> new file mode 100644
> index 0000000..62aa57b
> --- /dev/null
> +++ b/package/qt5/qt5base/0008-ccache_buildroot_fix.patch
> @@ -0,0 +1,16 @@
> +Author: Jaap Crezee <jaap@jcz.nl>

All patches should have a description + Signed-off-by (and not
Author:). See the Buildroot manual.

Also, did you file a bug in Qt's bug tracker for this issue?

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/qt5/qt5base/0008-ccache_buildroot_fix.patch b/package/qt5/qt5base/0008-ccache_buildroot_fix.patch
new file mode 100644
index 0000000..62aa57b
--- /dev/null
+++ b/package/qt5/qt5base/0008-ccache_buildroot_fix.patch
@@ -0,0 +1,16 @@ 
+Author: Jaap Crezee <jaap@jcz.nl>
+---
+diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
+index cd3a0cf..674b3dd 100644
+--- a/mkspecs/features/device_config.prf
++++ b/mkspecs/features/device_config.prf
+@@ -35,6 +35,9 @@ defineTest(deviceSanityCheckCompiler) {
+             return()
+     }
+ 
++    # Last resort, check if we can still execute it (for example in Buildroot/Crosscompile...)
++    system("which $$QMAKE_CXX > /dev/null"):return()
++
+     # QMAKE_CXX does not point to a compiler.
+     error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option")
+ }