diff options
-rw-r--r-- | meta/packages/glibc/glibc-package.bbclass | 26 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_2.4.bb | 2 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_2.5.bb | 2 |
3 files changed, 17 insertions, 13 deletions
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass index 84541c69f0..b8f527f97a 100644 --- a/meta/packages/glibc/glibc-package.bbclass +++ b/meta/packages/glibc/glibc-package.bbclass | |||
@@ -123,23 +123,23 @@ rm -rf ${TMP_LOCALE} | |||
123 | } | 123 | } |
124 | 124 | ||
125 | python __anonymous () { | 125 | python __anonymous () { |
126 | enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) | 126 | enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) |
127 | 127 | ||
128 | if enabled and int(enabled): | 128 | if enabled and int(enabled): |
129 | import re | 129 | import re |
130 | 130 | ||
131 | target_arch = bb.data.getVar("TARGET_ARCH", d, 1) | 131 | target_arch = bb.data.getVar("TARGET_ARCH", d, 1) |
132 | binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" | 132 | binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" |
133 | 133 | ||
134 | for regexp in binary_arches.split(" "): | 134 | for regexp in binary_arches.split(" "): |
135 | r = re.compile(regexp) | 135 | r = re.compile(regexp) |
136 | 136 | ||
137 | if r.match(target_arch): | 137 | if r.match(target_arch): |
138 | depends = bb.data.getVar("DEPENDS", d, 1) | 138 | depends = bb.data.getVar("DEPENDS", d, 1) |
139 | depends = "%s qemu-native" % depends | 139 | depends = "%s qemu-native" % depends |
140 | bb.data.setVar("DEPENDS", depends, d) | 140 | bb.data.setVar("DEPENDS", depends, d) |
141 | bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d) | 141 | bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d) |
142 | break | 142 | break |
143 | } | 143 | } |
144 | 144 | ||
145 | do_prep_locale_tree() { | 145 | do_prep_locale_tree() { |
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index 857af90828..fe8abe6c5c 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb | |||
@@ -18,6 +18,8 @@ GLIBC_EXTRA_OECONF ?= "" | |||
18 | 18 | ||
19 | GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" | 19 | GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" |
20 | 20 | ||
21 | LIMIT_BUILT_LOCALES = "en_GB" | ||
22 | |||
21 | # | 23 | # |
22 | # For now, we will skip building of a gcc package if it is a uclibc one | 24 | # For now, we will skip building of a gcc package if it is a uclibc one |
23 | # and our build is not a uclibc one, and we skip a glibc one if our build | 25 | # and our build is not a uclibc one, and we skip a glibc one if our build |
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index d3c6ab02ec..24a91f5b0a 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb | |||
@@ -14,6 +14,8 @@ GLIBC_EXTRA_OECONF ?= "" | |||
14 | 14 | ||
15 | GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" | 15 | GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" |
16 | 16 | ||
17 | LIMIT_BUILT_LOCALES = "en_GB" | ||
18 | |||
17 | # | 19 | # |
18 | # For now, we will skip building of a gcc package if it is a uclibc one | 20 | # For now, we will skip building of a gcc package if it is a uclibc one |
19 | # and our build is not a uclibc one, and we skip a glibc one if our build | 21 | # and our build is not a uclibc one, and we skip a glibc one if our build |