From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 10 Jan 2017 23:39:22 +0000 (-0600)
Subject: qtbase: Use compiler settings provided by IMX-GPU driver pkg-config
X-Git-Tag: 2.2~52
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e0002ee9e238c6df297deb5c52a81d44b2f451b2;p=meta-freescale.git

qtbase: Use compiler settings provided by IMX-GPU driver pkg-config

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index f5064a84..376358cc 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -21,29 +21,15 @@ do_configure_prepend_mx6() {
     sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
     if test ${HAS_X11} -eq 0; then
         if [ "${IMXGPU}" = "3d" ]; then
-    
             cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
 EGLFS_DEVICE_INTEGRATION = eglfs_viv
-EOF
-        else
-            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1
 EOF
         fi
-    else
-        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1
-EOF
     fi
     cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 QMAKE_LIBS_EGL         += -lEGL
 QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
 QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
-QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
-QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
-QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
-QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
 
 load(qt_config)