diff options
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 58 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale_2.12.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 59 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 12 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 12 |
7 files changed, 76 insertions, 74 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index ce85d99096..448f73a971 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc | |||
@@ -52,6 +52,10 @@ do_install () { | |||
52 | done | 52 | done |
53 | } | 53 | } |
54 | 54 | ||
55 | do_install_locale() { | ||
56 | : | ||
57 | } | ||
58 | |||
55 | do_siteconfig () { | 59 | do_siteconfig () { |
56 | : | 60 | : |
57 | } | 61 | } |
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb index b934f5b1bb..787c762609 100644 --- a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb | |||
@@ -1,10 +1,6 @@ | |||
1 | require eglibc_${PV}.bb | 1 | require eglibc_${PV}.bb |
2 | require eglibc-initial.inc | 2 | require eglibc-initial.inc |
3 | 3 | ||
4 | do_install_locale() { | ||
5 | : | ||
6 | } | ||
7 | |||
8 | do_configure_prepend () { | 4 | do_configure_prepend () { |
9 | unset CFLAGS | 5 | unset CFLAGS |
10 | } | 6 | } |
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc new file mode 100644 index 0000000000..ed6c099c6c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-locale.inc | |||
@@ -0,0 +1,58 @@ | |||
1 | INHIBIT_DEFAULT_DEPS = "1" | ||
2 | LICENSE = "LGPL" | ||
3 | |||
4 | BPN = "eglibc" | ||
5 | |||
6 | do_fetch[noexec] = "1" | ||
7 | do_unpack[noexec] = "1" | ||
8 | do_patch[noexec] = "1" | ||
9 | do_configure[noexec] = "1" | ||
10 | do_compile[noexec] = "1" | ||
11 | |||
12 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION | ||
13 | # is set. The idea is to avoid running localedef on the target (at first boot) | ||
14 | # to decrease initial boot time and avoid localedef being killed by the OOM | ||
15 | # killer which used to effectively break i18n on machines with < 128MB RAM. | ||
16 | |||
17 | # default to disabled | ||
18 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" | ||
19 | ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" | ||
20 | |||
21 | #enable locale generation on these arches | ||
22 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | ||
23 | BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | ||
24 | |||
25 | # set "1" to use cross-localedef for locale generation | ||
26 | # set "0" for qemu emulation of native localedef for locale generation | ||
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | ||
28 | |||
29 | PR = "r0" | ||
30 | |||
31 | PKGSUFFIX = "" | ||
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | ||
33 | |||
34 | PACKAGES = "eglibc-locale localedef${PKGSUFFIX}" | ||
35 | |||
36 | PACKAGES_DYNAMIC = "locale-base-* \ | ||
37 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ | ||
38 | glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" | ||
39 | |||
40 | PROVIDES = "virtual/libc-locale${PKGSUFFIX}" | ||
41 | |||
42 | RPROVIDES_eglibc-locale = "glibc-locale" | ||
43 | |||
44 | FILES_eglibc-gconv = "${libdir}/gconv/*" | ||
45 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" | ||
46 | |||
47 | do_install () { | ||
48 | cp -fpPR ${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} | ||
49 | cp -fpPR ${D}/SUPPORTED ${WORKDIR} | ||
50 | } | ||
51 | |||
52 | DESCRIPTION_localedef = "eglibc: compile locale definition files" | ||
53 | |||
54 | inherit libc-package | ||
55 | |||
56 | do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" | ||
57 | |||
58 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.12.bb b/meta/recipes-core/eglibc/eglibc-locale_2.12.bb new file mode 100644 index 0000000000..ce6c1d2320 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-locale_2.12.bb | |||
@@ -0,0 +1 @@ | |||
require eglibc-locale.inc | |||
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.13.bb b/meta/recipes-core/eglibc/eglibc-locale_2.13.bb index ed6c099c6c..ce6c1d2320 100644 --- a/meta/recipes-core/eglibc/eglibc-locale_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc-locale_2.13.bb | |||
@@ -1,58 +1 @@ | |||
1 | INHIBIT_DEFAULT_DEPS = "1" | require eglibc-locale.inc | |
2 | LICENSE = "LGPL" | ||
3 | |||
4 | BPN = "eglibc" | ||
5 | |||
6 | do_fetch[noexec] = "1" | ||
7 | do_unpack[noexec] = "1" | ||
8 | do_patch[noexec] = "1" | ||
9 | do_configure[noexec] = "1" | ||
10 | do_compile[noexec] = "1" | ||
11 | |||
12 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION | ||
13 | # is set. The idea is to avoid running localedef on the target (at first boot) | ||
14 | # to decrease initial boot time and avoid localedef being killed by the OOM | ||
15 | # killer which used to effectively break i18n on machines with < 128MB RAM. | ||
16 | |||
17 | # default to disabled | ||
18 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" | ||
19 | ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" | ||
20 | |||
21 | #enable locale generation on these arches | ||
22 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | ||
23 | BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | ||
24 | |||
25 | # set "1" to use cross-localedef for locale generation | ||
26 | # set "0" for qemu emulation of native localedef for locale generation | ||
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | ||
28 | |||
29 | PR = "r0" | ||
30 | |||
31 | PKGSUFFIX = "" | ||
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | ||
33 | |||
34 | PACKAGES = "eglibc-locale localedef${PKGSUFFIX}" | ||
35 | |||
36 | PACKAGES_DYNAMIC = "locale-base-* \ | ||
37 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ | ||
38 | glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" | ||
39 | |||
40 | PROVIDES = "virtual/libc-locale${PKGSUFFIX}" | ||
41 | |||
42 | RPROVIDES_eglibc-locale = "glibc-locale" | ||
43 | |||
44 | FILES_eglibc-gconv = "${libdir}/gconv/*" | ||
45 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" | ||
46 | |||
47 | do_install () { | ||
48 | cp -fpPR ${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} | ||
49 | cp -fpPR ${D}/SUPPORTED ${WORKDIR} | ||
50 | } | ||
51 | |||
52 | DESCRIPTION_localedef = "eglibc: compile locale definition files" | ||
53 | |||
54 | inherit libc-package | ||
55 | |||
56 | do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" | ||
57 | |||
58 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index fd8fee8031..8228484815 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -88,3 +88,15 @@ DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through | |||
88 | 88 | ||
89 | inherit libc-common | 89 | inherit libc-common |
90 | 90 | ||
91 | do_install_locale () { | ||
92 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
93 | install -d ${dest} ${dest}${bindir} | ||
94 | cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} | ||
95 | cp -fpPR ${D}${libdir} ${dest}${exec_prefix} | ||
96 | cp -fpPR ${D}${datadir} ${dest}${exec_prefix} | ||
97 | cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} | ||
98 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | ||
99 | } | ||
100 | |||
101 | addtask do_install_locale after do_install before do_populate_sysroot | ||
102 | |||
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 603d9cdc62..3490d2db9f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -110,18 +110,6 @@ do_compile () { | |||
110 | ) | 110 | ) |
111 | } | 111 | } |
112 | 112 | ||
113 | do_install_locale () { | ||
114 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
115 | install -d ${dest} ${dest}${bindir} | ||
116 | cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} | ||
117 | cp -fpPR ${D}${libdir} ${dest}${exec_prefix} | ||
118 | cp -fpPR ${D}${datadir} ${dest}${exec_prefix} | ||
119 | cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} | ||
120 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | ||
121 | } | ||
122 | |||
123 | addtask do_install_locale after do_install before do_populate_sysroot | ||
124 | |||
125 | require eglibc-package.inc | 113 | require eglibc-package.inc |
126 | 114 | ||
127 | BBCLASSEXTEND = "nativesdk" | 115 | BBCLASSEXTEND = "nativesdk" |