diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.16.bb | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index 3b99ac2854..f44db0c00e 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc | |||
@@ -19,6 +19,7 @@ do_configure () { | |||
19 | --prefix=/usr \ | 19 | --prefix=/usr \ |
20 | --without-cvs --disable-sanity-checks \ | 20 | --without-cvs --disable-sanity-checks \ |
21 | --with-headers=${STAGING_DIR_TARGET}${includedir} \ | 21 | --with-headers=${STAGING_DIR_TARGET}${includedir} \ |
22 | --with-kconfig=${STAGING_BINDIR_NATIVE} \ | ||
22 | --enable-hacker-mode --enable-addons | 23 | --enable-hacker-mode --enable-addons |
23 | } | 24 | } |
24 | 25 | ||
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc index 6009278577..8a8b364a6e 100644 --- a/meta/recipes-core/eglibc/eglibc-options.inc +++ b/meta/recipes-core/eglibc/eglibc-options.inc | |||
@@ -2,10 +2,10 @@ def eglibc_cfg(feature, features, tokens, cnf): | |||
2 | if type(tokens) == type(""): | 2 | if type(tokens) == type(""): |
3 | tokens = [tokens] | 3 | tokens = [tokens] |
4 | if type(features) == type([]) and feature in features: | 4 | if type(features) == type([]) and feature in features: |
5 | cnf.extend([token + ' = y' for token in tokens]) | 5 | cnf.extend([token + '=y' for token in tokens]) |
6 | else: | 6 | else: |
7 | for token in tokens: | 7 | for token in tokens: |
8 | cnf.extend([token + ' = n']) | 8 | cnf.extend([token + '=n']) |
9 | if token == 'OPTION_EGLIBC_NSSWITCH': | 9 | if token == 'OPTION_EGLIBC_NSSWITCH': |
10 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"]) | 10 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"]) |
11 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"]) | 11 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"]) |
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 02f3c7a959..29e303fafd 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc | |||
@@ -56,6 +56,10 @@ do_configure_prepend() { | |||
56 | echo '${OE_FEATURES}' > ${B}/option-groups.config | 56 | echo '${OE_FEATURES}' > ${B}/option-groups.config |
57 | } | 57 | } |
58 | 58 | ||
59 | do_configure_append() { | ||
60 | oe_runmake config | ||
61 | } | ||
62 | |||
59 | GLIBC_ADDONS ?= "ports,nptl,libidn" | 63 | GLIBC_ADDONS ?= "ports,nptl,libidn" |
60 | SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" | 64 | SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" |
61 | GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}" | 65 | GLIBC_ADDONS_virtclass-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 5a10387c1c..030b2351bd 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb | |||
@@ -2,7 +2,7 @@ require eglibc.inc | |||
2 | 2 | ||
3 | SRCREV = "20393" | 3 | SRCREV = "20393" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native kconfig-frontends-native" |
6 | PR = "r8" | 6 | PR = "r8" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
@@ -79,6 +79,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
79 | --with-headers=${STAGING_INCDIR} \ | 79 | --with-headers=${STAGING_INCDIR} \ |
80 | --without-selinux \ | 80 | --without-selinux \ |
81 | --enable-obsolete-rpc \ | 81 | --enable-obsolete-rpc \ |
82 | --with-kconfig=${STAGING_BINDIR_NATIVE} \ | ||
82 | ${GLIBC_EXTRA_OECONF}" | 83 | ${GLIBC_EXTRA_OECONF}" |
83 | 84 | ||
84 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 85 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |