summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-06 15:23:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 12:08:12 +0100
commit1a4b277e47a8d624cde4c73713d036e230f3a523 (patch)
treec15cbbe5a828383404bfe20f4f61ae5e4d8385ab
parent5857772e285ad6e39b7216bc542189e45f6fdbf7 (diff)
downloadopenembedded-core-1a4b277e47a8d624cde4c73713d036e230f3a523.tar.gz
openembedded-core-1a4b277e47a8d624cde4c73713d036e230f3a523.tar.bz2
openembedded-core-1a4b277e47a8d624cde4c73713d036e230f3a523.zip
machines/x86: Drop redundant glibc configure knobs
nptl and thereby tls are not optional anymore Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/conf/machine/include/ia32-base.inc5
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf4
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"
SERIAL_CONSOLE ?= "115200 ttyS0"
#
-# glibc-related variables
-#
-GLIBC_ADDONS ?= "nptl"
-
-#
# kernel-related variables
#
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
MACHINE_FEATURES += "x86"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
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
MACHINE_FEATURES += "x86"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-