projects / scm / bb / tizen-distro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5460ccf)
qt bbappends: play nice with bbappends in other layers by incrementing PRINC instead...
authorKoen Kooi <koen@dominion.thruhere.net>
Fri, 20 Apr 2012 10:58:20 +0000 (10:58 +0000)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:20:16 +0000 (08:20 -0800)
(From meta-openembedded rev: 9018be6edb57f47f0c8734e9fe02e846aa14e3c0)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend patch | blob | history
meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend patch | blob | history
meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend patch | blob | history
meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend patch | blob | history

diff --git a/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend b/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend
index 9b4ede4..27cac11 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend
+++ b/meta-openembedded/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-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend b/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend
index 3c1ac5e..27cac11 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.0.bbappend
+++ b/meta-openembedded/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-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend b/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend
index 9b4ede4..27cac11 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend
+++ b/meta-openembedded/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-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend b/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend
index 3c1ac5e..27cac11 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.0.bbappend
+++ b/meta-openembedded/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}"
Domain: SCM / BB;