[Buildroot] [PATCH 1/2] qt5base: use -device-option to set mkspec variables

[Fatih Aşıcı]

On Tuesday 19 November 2013 00:41:01 Arnout Vandecappelle wrote:
> On 14/11/13 14:40, Fatih Aşıcı wrote:
> > In additon to the simplification of code, this change is a preparation
> > to solve problems occurring when QMAKE_CXX is prepended with ccache path.
> 
>   Please also mention that you replace part of our custom qmake.conf with
> linux_device_pre.conf.

Done.

> > Upstream patch is needed by configure to parse device options correctly.
> > 
> > Signed-off-by: Fatih Aşıcı <fatih.asici at gmail.com>
> > ---
> > 
> >   .../qt5/qt5base/qt5base-0002-mkspecs-files.patch   | 39
> >   ++--------------------
> >   ...igure-Parse-device-option-value-correctly.patch | 36
> >   ++++++++++++++++++++ package/qt5/qt5base/qt5base.mk                   
> >    | 18 +++------- 3 files changed, 43 insertions(+), 50 deletions(-)
> >   create mode 100644
> >   package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-c
> >   orrectly.patch
> > 
> > diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
> > b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch index
> > e406cfc..3fddeac 100644
> > --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
> > +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
> > @@ -14,50 +14,17 @@ Index:
> > b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > 
> >   ===================================================================
> >   --- /dev/null
> >   +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > 
> > -@@ -0,0 +1,44 @@
> > -+MAKEFILE_GENERATOR      = UNIX
> > -+CONFIG                 += incremental gdb_dwarf_index
> > -+QMAKE_INCREMENTAL_STYLE = sublib
> > -+
> > -+include(../../common/linux.conf)
> > -+include(../../common/gcc-base-unix.conf)
> > -+include(../../common/g++-unix.conf)
> > -+
> > -+load(device_config)
> > -+
> > -+QT_QPA_DEFAULT_PLATFORM = eglfs
> > -+
> > -+BUILDROOT_CROSS_COMPILE =
> > -+BUILDROOT_COMPILER_CFLAGS =
> > -+BUILDROOT_COMPILER_CXXFLAGS =
> > -+BUILDROOT_INCLUDE_PATH =
> > -+
> > -+# modifications to g++.conf
> > -+QMAKE_CC                = $${BUILDROOT_CROSS_COMPILE}gcc
> > -+QMAKE_CXX               = $${BUILDROOT_CROSS_COMPILE}g++
> > -+QMAKE_LINK              = $${QMAKE_CXX}
> > -+QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
> > -+
> > -+# modifications to linux.conf
> > -+QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs
> > -+QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy
> > -+QMAKE_NM                = $${BUILDROOT_CROSS_COMPILE}nm -P
> > -+QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip
> > +@@ -0,0 +1,11 @@
> > ++include(../common/linux_device_pre.conf)
> > 
> >   +
> >   +#modifications to gcc-base.conf
> >   +QMAKE_CFLAGS           += $${BUILDROOT_COMPILER_CFLAGS}
> >   +QMAKE_CXXFLAGS         += $${BUILDROOT_COMPILER_CXXFLAGS}
> >   +QMAKE_CXXFLAGS_RELEASE += -O3
> > 
> > -+INCLUDEPATH            += $${BUILDROOT_INCLUDE_PATH}
> 
>   I guess this is indeed redundant, since it just adds
> $(STAGING_DIR)/usr/include which is unnecessary. But you should at least
> mention this explicitly in the commit message.

Done.

> >   +
> >   +QMAKE_LIBS             += -lrt -lpthread -ldl
> >   +
> > 
> > -+# device specific glue code
> > -+EGLFS_PLATFORM_HOOKS_SOURCES =
> > -+
> > -+# Sanity check
> > -+deviceSanityCheckCompiler()
> > -+
> > ++include(../common/linux_device_post.conf)
> 
>   Unfortunately, linux_device_post.conf is broken. It contains:
> 
> contains(DISTRO_OPTS, hard-float) {
>      COMPILER_FLAGS += -mfloat-abi=hard
> } else {
>      COMPILER_FLAGS += -mfloat-abi=softfp
> }
> 
>   It seems this file is ARM-specific, and it's only used by imx6,
> raspberrypi and tegra2. Note that linux_device_pre.conf is also only used
> by these three, but that one looks generic enough :-)
> 
>   So I propose that you leave the last part as it was.

Added an upstream patch which removes ARM specific parts.
 
> >   +load(qt_config)
> >   Index: b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
> >   ===================================================================
> > 
> > diff --git
> > a/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-c
> > orrectly.patch
> > b/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-c
> > orrectly.patch new file mode 100644
> > index 0000000..7eb9229
> > --- /dev/null
> > +++
> > b/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-c
> > orrectly.patch @@ -0,0 +1,36 @@
> > +From 4723f3fd04edf1aad6750ca91fd4648216d8b408 Mon Sep 17 00:00:00 2001
> > +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici at gmail.com>
> > +Date: Sat, 21 Sep 2013 00:14:39 +0300
> > +Subject: [PATCH] configure: Parse -device-option value correctly
> > +
> > +The regular expression does not parse correctly when a device option
> > value +contains the character '=' (e.g.
> > QMAKE_CFLAGS="-D_FILE_OFFSET_BITS=64"). +
> > +In order to break string at the first equal sign and to simplify code,
> > +use "cut" command as in other places in configure script.
> > +
> > +Task-number: QTBUG-33584
> > +Change-Id: I05b474d2ba6bff84c1e40d00475963bab36d94b6
> > +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at digia.com>
> 
>   You should still add your own Signed-off-by, even if this is not
> required by upstream.

Done.

Thanks for the review. I have sent v2 of the first patch.