]> code.ossystems Code Review - meta-freescale.git/commitdiff
qtbase: Fix patch fuzz for mkspecs/linux-oe-g++/qmake.conf
authorantznin <agodard@witekio.com>
Tue, 5 May 2020 13:28:15 +0000 (15:28 +0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 5 May 2020 14:58:53 +0000 (11:58 -0300)
The current version of the patch causes a fuzz because of context
change.

Signed-off-by: antznin <agodard@witekio.com>
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch

index 8e7129e3fd1449b6ca8abbb6a15d893180b2cd0e..46541d438e2f764c84b041bf51c95689b9a7e1cb 100644 (file)
@@ -1,8 +1,8 @@
-Index: git/mkspecs/linux-oe-g++/qmake.conf
-===================================================================
---- git.orig/mkspecs/linux-oe-g++/qmake.conf   2016-12-14 17:03:17.000000000 -0600
-+++ git/mkspecs/linux-oe-g++/qmake.conf        2016-12-14 17:06:23.000000000 -0600
-@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
+diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
+index c202c47fa1..2bfb96f4ec 100644
+--- a/mkspecs/linux-oe-g++/qmake.conf
++++ b/mkspecs/linux-oe-g++/qmake.conf
+@@ -33,6 +33,8 @@ QMAKE_CFLAGS_ISYSTEM =
  # for the SDK
  isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
  
@@ -10,4 +10,6 @@ Index: git/mkspecs/linux-oe-g++/qmake.conf
 +
  include(../oe-device-extra.pri)
  
- QMAKE_LIBS_EGL        += -lEGL
+ load(device_config)
+-- 
+2.17.1