diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-15 18:25:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-22 09:16:00 +0100 |
commit | f09b074de8cb25914f996fd34a19d8d695cb0f70 (patch) | |
tree | 74dd3859b6fcc6b9dcb87a1f3786e19f6677fb9d /meta/classes | |
parent | c1b4bea9a1fe8eb2a22a82fd22af423489e0a8fa (diff) | |
download | poky-f09b074de8cb25914f996fd34a19d8d695cb0f70.tar.gz |
meta: Drop further 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: ec03023d2165b49a52b83bac1ea2f0bfded7b852)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9a04b43674..d806f7ea45 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -85,7 +85,6 @@ PID = "${@os.getpid()}" | |||
85 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 85 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
86 | 86 | ||
87 | LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" | 87 | LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" |
88 | LDCONFIGDEPEND_libc-uclibc = "" | ||
89 | LDCONFIGDEPEND_libc-musl = "" | 88 | LDCONFIGDEPEND_libc-musl = "" |
90 | 89 | ||
91 | # This is needed to have depmod data in PKGDATA_DIR, | 90 | # This is needed to have depmod data in PKGDATA_DIR, |
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 6b7f3dd76e..9c434dce83 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -108,7 +108,7 @@ PKG_CONFIG_SYSROOT_DIR = "" | |||
108 | PKG_CONFIG_SYSTEM_LIBRARY_PATH[unexport] = "1" | 108 | PKG_CONFIG_SYSTEM_LIBRARY_PATH[unexport] = "1" |
109 | PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" | 109 | PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" |
110 | 110 | ||
111 | # we dont want libc-uclibc or libc-glibc to kick in for native recipes | 111 | # we dont want libc-*libc to kick in for native recipes |
112 | LIBCOVERRIDE = "" | 112 | LIBCOVERRIDE = "" |
113 | CLASSOVERRIDE = "class-native" | 113 | CLASSOVERRIDE = "class-native" |
114 | MACHINEOVERRIDES = "" | 114 | MACHINEOVERRIDES = "" |
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 260ece9676..0ee0ec53f5 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -3,7 +3,6 @@ inherit toolchain-scripts-base siteinfo kernel-arch | |||
3 | # We want to be able to change the value of MULTIMACH_TARGET_SYS, because it | 3 | # We want to be able to change the value of MULTIMACH_TARGET_SYS, because it |
4 | # doesn't always match our expectations... but we default to the stock value | 4 | # doesn't always match our expectations... but we default to the stock value |
5 | REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}" | 5 | REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}" |
6 | TARGET_CC_ARCH_append_libc-uclibc = " -muclibc" | ||
7 | TARGET_CC_ARCH_append_libc-musl = " -mmusl" | 6 | TARGET_CC_ARCH_append_libc-musl = " -mmusl" |
8 | 7 | ||
9 | # default debug prefix map isn't valid in the SDK | 8 | # default debug prefix map isn't valid in the SDK |