diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-06 15:23:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 13:01:50 +0100 |
commit | 5cf953b02ea6d103b7c09d6f36c198d550d06367 (patch) | |
tree | 72425f55615e06c86f59d3a538125e1df07d3181 /meta/conf | |
parent | f23d843747208d50770aaabf0796a77b84919a94 (diff) | |
download | poky-5cf953b02ea6d103b7c09d6f36c198d550d06367.tar.gz |
machines/x86: Drop redundant glibc configure knobs
nptl and thereby tls are not optional anymore
(From OE-Core rev: 1a4b277e47a8d624cde4c73713d036e230f3a523)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/include/ia32-base.inc | 5 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index af583ae184..78d4458066 100644 --- a/meta/conf/machine/include/ia32-base.inc +++ b/meta/conf/machine/include/ia32-base.inc | |||
@@ -18,11 +18,6 @@ KERNEL_IMAGETYPE ?= "bzImage" | |||
18 | SERIAL_CONSOLE ?= "115200 ttyS0" | 18 | SERIAL_CONSOLE ?= "115200 ttyS0" |
19 | 19 | ||
20 | # | 20 | # |
21 | # glibc-related variables | ||
22 | # | ||
23 | GLIBC_ADDONS ?= "nptl" | ||
24 | |||
25 | # | ||
26 | # kernel-related variables | 21 | # kernel-related variables |
27 | # | 22 | # |
28 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 23 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 285054ab3d..8d4bd6f487 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -26,7 +26,4 @@ require conf/machine/include/qemu.inc | |||
26 | 26 | ||
27 | MACHINE_FEATURES += "x86" | 27 | MACHINE_FEATURES += "x86" |
28 | 28 | ||
29 | GLIBC_ADDONS = "nptl" | ||
30 | GLIBC_EXTRA_OECONF = "--with-tls" | ||
31 | |||
32 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index c81afe5657..6edf386d0e 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -26,8 +26,4 @@ require conf/machine/include/qemu.inc | |||
26 | 26 | ||
27 | MACHINE_FEATURES += "x86" | 27 | MACHINE_FEATURES += "x86" |
28 | 28 | ||
29 | GLIBC_ADDONS = "nptl" | ||
30 | GLIBC_EXTRA_OECONF = "--with-tls" | ||
31 | |||
32 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
33 | |||