[oe-commits] Koen Kooi : qt bbappends: play nice with bbappends in other layers by incrementing PRINC instead of overwriting it

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 9018be6edb57f47f0c8734e9fe02e846aa14e3c0
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9018be6edb57f47f0c8734e9fe02e846aa14e3c0

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Fri Apr 20 10:58:20 2012 +0000

qt bbappends: play nice with bbappends in other layers by incrementing PRINC instead of overwriting it

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend |    1 +
 meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend |    2 +-
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend |    1 +
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend |    2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend b/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend
index 9b4ede4..27cac11 100644
--- a/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend
@@ -3,3 +3,4 @@ QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-
 QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
                     -I${STAGING_INCDIR}/postgresql"
 
+PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend
index 3c1ac5e..27cac11 100644
--- a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend
@@ -3,4 +3,4 @@ QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-
 QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
                     -I${STAGING_INCDIR}/postgresql"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend
index 9b4ede4..27cac11 100644
--- a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend
@@ -3,3 +3,4 @@ QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-
 QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
                     -I${STAGING_INCDIR}/postgresql"
 
+PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend
index 3c1ac5e..27cac11 100644
--- a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend
@@ -3,4 +3,4 @@ QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-
 QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
                     -I${STAGING_INCDIR}/postgresql"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"