summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend3
-rw-r--r--meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb2
2 files changed, 5 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
index f37910179f..f6e5dd9a21 100644
--- a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
+++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
@@ -1,3 +1,6 @@
1RDEPENDS_${PN} += "qwt-e-dev" 1RDEPENDS_${PN} += "qwt-e-dev"
2 2
3# qwt-e conflicts with qwt, so only one can be built in world and this pulls qwt-e
4EXCLUDE_FROM_WORLD = "1"
5
3PRINC := "${@int(PRINC) + 1}" 6PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
index 6a8013618f..c801309132 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -9,4 +9,6 @@ SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924db
9 9
10RPROVIDES_${PN}-dev = "libqwt-dev" 10RPROVIDES_${PN}-dev = "libqwt-dev"
11 11
12# Conflicts with qwt, only one qwt* can be built in world
13# | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.*
12EXCLUDE_FROM_WORLD = "1" 14EXCLUDE_FROM_WORLD = "1"