ne10: set incompatible for armv7 without neon
PATCH 1/1 ne10: set incompatible for armv7 without neon
From: Benjamin Bara <[email protected]>
ne10 requires NEON[1], therefore set incompatible for incompatible machines. In this case, don't depend on it in libopus, as it is optional anyways.
[1] https://github.com/projectNe10/Ne10/blob/v1.2.1/CMakeLists.txt#L139
Signed-off-by Benjamin Bara <[email protected]>
--- .../recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 ++-- meta-oe/recipes-multimedia/libopus/libopus_1.4.bb | 4 ++-- meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +2 -2
@@ -925,8 +925,8 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libmicrohttpd \ yaml-cpp \ " -RDEPENDS:packagegroup-meta-oe-support:append:armv7a = " ne10" -RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = " ne10" +RDEPENDS:packagegroup-meta-oe-support:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10" RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers" RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
meta-oe/recipes-multimedia/libopus/libopus_1.4.bb +2 -2
@@ -29,8 +29,8 @@ EXTRA_OECONF = " \ # ne10 is available only for armv7a, armv7ve and aarch64 DEPENDS:append:aarch64 = " ne10" -DEPENDS:append:armv7a = " ne10" -DEPENDS:append:armv7ve = " ne10" +DEPENDS:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +DEPENDS:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" python () { if d.getVar('TARGET_FPU') in [ 'soft' ]:
meta-oe/recipes-support/ne10/ne10_1.2.1.bb +4 -4
@@ -18,12 +18,12 @@ inherit cmake # Incompatible with archs other than armv7, armv7ve and aarch64 COMPATIBLE_MACHINE = "(^$)" COMPATIBLE_MACHINE:aarch64 = "(.*)" -COMPATIBLE_MACHINE:armv7a = "(.*)" -COMPATIBLE_MACHINE:armv7ve = "(.*)" +COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" +COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" NE10_TARGET_ARCH = "" NE10_TARGET_ARCH:aarch64 = "aarch64" -NE10_TARGET_ARCH:armv7a = "armv7" -NE10_TARGET_ARCH:armv7ve = "armv7" +NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" +NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"'
Signature · 1 line
2.34.1