diff options
Diffstat (limited to 'meta-oe/recipes-qt')
-rw-r--r-- | meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend | 3 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 2 |
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 @@ RDEPENDS_${PN} += "qwt-e-dev" +# qwt-e conflicts with qwt, so only one can be built in world and this pulls qwt-e +EXCLUDE_FROM_WORLD = "1" + PRINC := "${@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 RPROVIDES_${PN}-dev = "libqwt-dev" +# Conflicts with qwt, only one qwt* can be built in world +# | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.* EXCLUDE_FROM_WORLD = "1" |