From ed929bed4cccdf9836dff149ac8beab62abbfbd3 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 27 Aug 2019 08:52:00 +0300 Subject: world-broken.inc: Remove Move still required entries as COMPATIBLE_HOST_libc-musl = 'null' to individual recipes. This also gives users a proper error message when trying to build a known non-building package. (From OE-Core rev: 8bbb17d2dcafa9b4e26941a55932f4be2782e1d1) Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/defaultsetup.conf | 1 - meta/conf/distro/include/world-broken.inc | 27 --------------------------- meta/recipes-devtools/prelink/prelink_git.bb | 3 +++ meta/recipes-devtools/pseudo/pseudo_git.bb | 2 ++ meta/recipes-devtools/qemu/qemu_4.1.0.bb | 4 ++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 4 ++++ 6 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 meta/conf/distro/include/world-broken.inc (limited to 'meta') diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 9b1ee20aaa..66fd246526 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -1,7 +1,6 @@ include conf/distro/include/default-providers.inc include conf/distro/include/default-versions.inc include conf/distro/include/default-distrovars.inc -include conf/distro/include/world-broken.inc include conf/distro/include/maintainers.inc TCMODE ?= "default" diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc deleted file mode 100644 index 42cacfdf2e..0000000000 --- a/meta/conf/distro/include/world-broken.inc +++ /dev/null @@ -1,27 +0,0 @@ -# -# Exclude known broken packages -# - -# rt-tests needs PI mutex support in libc -EXCLUDE_FROM_WORLD_pn-rt-tests_libc-musl = "1" - -# error: use of undeclared identifier '_STAT_VER' -EXCLUDE_FROM_WORLD_pn-pseudo_libc-musl = "1" - -# error: error.h: No such file or directory -EXCLUDE_FROM_WORLD_pn-prelink_libc-musl = "1" - -# error: obstack.h: No such file or directory -EXCLUDE_FROM_WORLD_pn-systemtap_libc-musl = "1" -EXCLUDE_FROM_WORLD_pn-systemtap-uprobes_libc-musl = "1" - -# error: a parameter list without types is only allowed in a function definition -# void (*_function)(sigval_t); -EXCLUDE_FROM_WORLD_pn-qemu_libc-musl = "1" - -# error: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Werror=format=] -# snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf))); -EXCLUDE_FROM_WORLD_pn-perf_libc-musl = "1" - -# error: 'RTLD_NEXT' was not declared in this scope -EXCLUDE_FROM_WORLD_pn-gcc-sanitizers_libc-musl = "1" diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb index b1261d5942..f0946de2cc 100644 --- a/meta/recipes-devtools/prelink/prelink_git.bb +++ b/meta/recipes-devtools/prelink/prelink_git.bb @@ -36,6 +36,9 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_sta " UPSTREAM_CHECK_COMMITS = "1" +# error: error.h: No such file or directory +COMPATIBLE_HOST_libc-musl = 'null' + TARGET_OS_ORIG := "${TARGET_OS}" OVERRIDES_append = ":${TARGET_OS_ORIG}" diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 6cf711e4c2..9d2e349087 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -12,3 +12,5 @@ SRCREV = "060058bb29f70b244e685b3c704eb0641b736f73" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" +# error: use of undeclared identifier '_STAT_VER' +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.1.0.bb index 76776098d0..f0c1daabe1 100644 --- a/meta/recipes-devtools/qemu/qemu_4.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_4.1.0.bb @@ -2,6 +2,10 @@ BBCLASSEXTEND = "nativesdk" require qemu.inc +# error: a parameter list without types is only allowed in a function definition +# void (*_function)(sigval_t); +COMPATIBLE_HOST_libc-musl = 'null' + DEPENDS = "glib-2.0 zlib pixman bison-native" RDEPENDS_${PN}_class-target += "bash" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index b673cd784f..5aa0aa10c3 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -14,6 +14,10 @@ SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ " + +# rt-tests needs PI mutex support in libc +COMPATIBLE_HOST_libc-musl = 'null' + # Do not install hwlatdetect EXTRA_OEMAKE += "PYLIB=''" -- cgit v1.2.3-54-g00ecf