diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-10-27 16:48:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:18:27 +0000 |
commit | 5d94d29f553456268351b26065cc69eb19e71b87 (patch) | |
tree | 6e9a8651524e8417f96e83595e83c8fa387d5bdf /meta/recipes-core/eglibc | |
parent | 74bb195f9f72d4f281f4c11f03ca46aee95ccd55 (diff) | |
download | poky-5d94d29f553456268351b26065cc69eb19e71b87.tar.gz |
recipes-core: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.16.bb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index 1520efd718..c1a090e39e 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc | |||
@@ -7,7 +7,7 @@ PACKAGES = "" | |||
7 | PACKAGES_DYNAMIC = "" | 7 | PACKAGES_DYNAMIC = "" |
8 | 8 | ||
9 | STAGINGCC = "gcc-cross-initial" | 9 | STAGINGCC = "gcc-cross-initial" |
10 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" | 10 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" |
11 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" | 11 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" |
12 | 12 | ||
13 | do_configure () { | 13 | do_configure () { |
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index e1ec6b2b8c..3d136bf8d7 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc | |||
@@ -3,7 +3,7 @@ require eglibc-ld.inc | |||
3 | require eglibc-testing.inc | 3 | require eglibc-testing.inc |
4 | 4 | ||
5 | STAGINGCC = "gcc-cross-initial" | 5 | STAGINGCC = "gcc-cross-initial" |
6 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" | 6 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" |
7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
8 | 8 | ||
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
@@ -39,7 +39,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \ | |||
39 | " | 39 | " |
40 | 40 | ||
41 | GLIBC_EXTRA_OECONF ?= "" | 41 | GLIBC_EXTRA_OECONF ?= "" |
42 | GLIBC_EXTRA_OECONF_virtclass-nativesdk = "" | 42 | GLIBC_EXTRA_OECONF_class-nativesdk = "" |
43 | INHIBIT_DEFAULT_DEPS = "1" | 43 | INHIBIT_DEFAULT_DEPS = "1" |
44 | 44 | ||
45 | ARM_INSTRUCTION_SET = "arm" | 45 | ARM_INSTRUCTION_SET = "arm" |
@@ -68,4 +68,4 @@ do_configure_append() { | |||
68 | 68 | ||
69 | GLIBC_ADDONS ?= "ports,nptl,libidn" | 69 | GLIBC_ADDONS ?= "ports,nptl,libidn" |
70 | SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" | 70 | SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" |
71 | GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}" | 71 | GLIBC_ADDONS_class-nativesdk = "${SDK_GLIBC_ADDONS}" |
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index 56a0a38192..aa9256cdc1 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb | |||
@@ -37,7 +37,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \ | |||
37 | file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ | 37 | file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ |
38 | file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " | 38 | file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " |
39 | 39 | ||
40 | SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \ | 40 | SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \ |
41 | file://relocatable_sdk.patch \ | 41 | file://relocatable_sdk.patch \ |
42 | " | 42 | " |
43 | S = "${WORKDIR}/eglibc-${PV}/libc" | 43 | S = "${WORKDIR}/eglibc-${PV}/libc" |