aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-04-20 10:58:20 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-21 12:49:59 +0200
commit9018be6edb57f47f0c8734e9fe02e846aa14e3c0 (patch)
tree432d4bbbf2199090df441617f028573dd1b1e2e0
parent9482551d5f79e535a85b95210050a682a06a951a (diff)
downloadmeta-openembedded-contrib-9018be6edb57f47f0c8734e9fe02e846aa14e3c0.tar.gz
meta-openembedded-contrib-9018be6edb57f47f0c8734e9fe02e846aa14e3c0.tar.bz2
meta-openembedded-contrib-9018be6edb57f47f0c8734e9fe02e846aa14e3c0.zip
qt bbappends: play nice with bbappends in other layers by incrementing PRINC instead of overwriting it
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend1
-rw-r--r--meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend2
-rw-r--r--meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend1
-rw-r--r--meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend2
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 9b4ede4454..27cac1105e 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 3c1ac5ee3d..27cac1105e 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 9b4ede4454..27cac1105e 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 3c1ac5ee3d..27cac1105e 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}"