diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-15 15:21:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-22 09:16:00 +0100 |
commit | eb40fcf6279478bf53f961f5477fc9e4162dd9a9 (patch) | |
tree | 71f1faf5904a8b8785bcf73b70ae60f679ec0274 /meta/recipes-core/glibc | |
parent | 1b489073dcf1e0836f7f2db8cb171debeb7a02e7 (diff) | |
download | poky-eb40fcf6279478bf53f961f5477fc9e4162dd9a9.tar.gz |
meta: Drop remnants of uclibc support
uclibc support was removed a while ago and musl works much better. Start to
remove the various overrides and patches related to uclibc which are no longer
needed.
uclibc support in a layer would still be possible. I have strong reasons to
believe nobody is still using uclibc since patches are missing and I doubt
the metadata even parses anymore.
(From OE-Core rev: 653704e9cf325cb494eb23facca19e9f05132ffd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-collateral.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 16 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.25.bb | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc index 37f27ca448..de859d5ce9 100644 --- a/meta/recipes-core/glibc/glibc-collateral.inc +++ b/meta/recipes-core/glibc/glibc-collateral.inc | |||
@@ -18,5 +18,4 @@ do_compile[noexec] = "1" | |||
18 | do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" | 18 | do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" |
19 | 19 | ||
20 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 20 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
21 | COMPATIBLE_HOST_libc-uclibc_class-target = "null" | ||
22 | 21 | ||
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 9f7fa62a37..645be694b5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -1,19 +1,3 @@ | |||
1 | # | ||
2 | # For now, we will skip building of a gcc package if it is a uclibc one | ||
3 | # and our build is not a uclibc one, and we skip a glibc one if our build | ||
4 | # is a uclibc build. | ||
5 | # | ||
6 | # See the note in gcc/gcc_3.4.0.oe | ||
7 | # | ||
8 | |||
9 | python __anonymous () { | ||
10 | import bb, re | ||
11 | uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS')) != None) | ||
12 | if uc_os: | ||
13 | raise bb.parse.SkipPackage("incompatible with target %s" % | ||
14 | d.getVar('TARGET_OS')) | ||
15 | } | ||
16 | |||
17 | INHIBIT_SYSROOT_STRIP = "1" | 1 | INHIBIT_SYSROOT_STRIP = "1" |
18 | 2 | ||
19 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" | 3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" |
diff --git a/meta/recipes-core/glibc/glibc_2.25.bb b/meta/recipes-core/glibc/glibc_2.25.bb index 83a1249b8c..c37438a2d1 100644 --- a/meta/recipes-core/glibc/glibc_2.25.bb +++ b/meta/recipes-core/glibc/glibc_2.25.bb | |||
@@ -67,7 +67,6 @@ GLIBC_BROKEN_LOCALES = "" | |||
67 | # this helps in easing out parsing for non-glibc system libraries | 67 | # this helps in easing out parsing for non-glibc system libraries |
68 | # | 68 | # |
69 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 69 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
70 | COMPATIBLE_HOST_libc-uclibc_class-target = "null" | ||
71 | 70 | ||
72 | EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | 71 | EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ |
73 | --without-cvs --disable-profile \ | 72 | --without-cvs --disable-profile \ |