From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 9 May 2013 13:22:53 +0000 (+0000)
Subject: eglibc/machine-sdk: Drop SDK_GLIBC_ADDONS
X-Git-Tag: yocto-4.0~32963
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fb0e792600b5adb58bc5fca90d8605c1c76280f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

eglibc/machine-sdk: Drop SDK_GLIBC_ADDONS

We no longer change GLIBC_ADDONS per target so we no longer need to special
case the SDK settings for it either.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine-sdk/i586.conf b/meta/conf/machine-sdk/i586.conf
index 190f2bdfb70..baacce70af9 100644
--- a/meta/conf/machine-sdk/i586.conf
+++ b/meta/conf/machine-sdk/i586.conf
@@ -1,4 +1,3 @@
 SDK_ARCH = "i586"
 SDK_CC_ARCH = "-march=i586"
 
-SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/conf/machine-sdk/i686.conf b/meta/conf/machine-sdk/i686.conf
index 3e8e4f4f456..ffdb46131cb 100644
--- a/meta/conf/machine-sdk/i686.conf
+++ b/meta/conf/machine-sdk/i686.conf
@@ -1,4 +1,2 @@
 SDK_ARCH = "i686"
 SDK_CC_ARCH = "-march=i686"
-
-SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/conf/machine-sdk/x86_64.conf b/meta/conf/machine-sdk/x86_64.conf
index 9495842a14a..812d67c8d29 100644
--- a/meta/conf/machine-sdk/x86_64.conf
+++ b/meta/conf/machine-sdk/x86_64.conf
@@ -1,3 +1 @@
 SDK_ARCH = "x86_64"
-
-SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 1e041977de4..40dd6b58476 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -78,5 +78,3 @@ do_configure_append() {
 }
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
-SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
-GLIBC_ADDONS_class-nativesdk = "${SDK_GLIBC_ADDONS}"