Skip to contentSkip to conversation

qt4-embedded: Reference QT_ARCH correctly in QT_CONFIG_FLAGS

PATCH Applied Anders Darander 3 participants 4 messages Jun 17, 2012 – Jun 18, 2012

lore
Share & tools
lore
#0 lore raw

cover qt4-embedded: Reference QT_ARCH correctly in QT_CONFIG_FLAGS

This single patch serie should be applied to master and denzil.

The commit "qt4: move functions from python to shell style", commit id:
98cb2efe4e9f3092d531c9fc809406c3ef559725 made it impossible to use oe_filter_out on QT_CONFIG_FLAGS. The error received was:

$ bitbake core-image-sato -eLoading cache: 100%                                         
|###################################################| ETA:  00:00:00                    
Loaded 1109 entries from dependency cache.                                              
ERROR: Failure expanding variable QT_CONFIG_FLAGS[:=], expression was                   
${@oe_filter_out('-plugin-gfx-transformed', '      -embedded ${QT_ARCH}                 
-qtlibinfix E     -plugin-gfx-transformed -plugin-gfx-qvfb                              
-plugin-gfx-vnc -plugin-gfx-directfb     -plugin-mouse-tslib                            
-qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput     -qt-kbd-tty                        
-DQT_KEYPAD_NAVIGATION      -release -no-cups -reduce-relocations                       
-shared -no-nas-sound -no-nis                     -system-libjpeg                       
-system-libpng -system-libtiff -system-zlib                     -no-pch                 
-qdbus -stl -glib -phonon -webkit                     -xmlpatterns                      
-no-rpath -qt3support -silent                     --enable-pulseaudio                   
-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite                
-no-accessibility -no-sm                        -exceptions ', d)} which                
triggered exception SyntaxError: EOL while scanning string literal                      
(QT_CONFIG_FLAGS[:=], line 1)                                                           
ERROR: Command execution failed: Exited with 1                                          

Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

The following changes since commit 63d1ae1c2828cda03828b4c3fdde037d7a23f1e4:

directfb: added missing Upstream-status (2012-06-15 15:41:11 +0100)

are available in the git repository at:

git://github.com/darander/oe-core qt4-arch-fix
https://github.com/darander/oe-core/tree/qt4-arch-fix

Anders Darander (1):
qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.10
#1 lore raw

PATCH 1/1 qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

After the change to shell style functions (from python style), the ability to use oe_filter_out on QT_CONFIG_FLAGS got broken.

This patch solves that by referring to QT_ARCH in a more correct way.

---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
index 05803d1..9c5b4af 100644
@@ -10,7 +10,7 @@ QT_BASE_LIB  ?= "libqt-embedded"
 SRC_URI += "file://qte.sh"
 
 QT_CONFIG_FLAGS += " \
-    -embedded ${QT_ARCH} \
+    -embedded $QT_ARCH \
     -qtlibinfix ${QT_LIBINFIX} \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
Signature · 1 line
1.7.10
#2 lore raw

Re: [oe-core, for-denzil][PATCH 1/1] qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

Quoted 15 lines · Anders Darander

After the change to shell style functions (from python style), the ability to use oe_filter_out on QT_CONFIG_FLAGS got broken.

This patch solves that by referring to QT_ARCH in a more correct way.

---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-qt/qt4/qt4-embedded.inc +0 -0
index 05803d1..9c5b4af 100644

meta/recipes-qt/qt4/qt4-embedded.inc QT_BASE_LIB ?= "libqt-embedded" · line 16

Quoted 8 lines
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
@@ -10,7 +10,7 @@ QT_BASE_LIB  ?= "libqt-embedded"
 SRC_URI += "file://qte.sh"
 
 QT_CONFIG_FLAGS += " \
-    -embedded ${QT_ARCH} \
+    -embedded $QT_ARCH \
     -qtlibinfix ${QT_LIBINFIX} \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \

Merged to master, thanks. cc'ing Scott for denzil...

Cheers,

Richard

#3 lore raw
In reply to Anders Darander
Quoted 1 line · Anders Darander

This single patch serie should be applied to master and denzil.

This is on my radar. I'm about to submit a denzil pull request now, but this won't be included in it until my next pull request.

Scott

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center