diff options
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-locale.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index d6bdcb5f2e..296afdef6e 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc | |||
@@ -17,7 +17,7 @@ do_compile[noexec] = "1" | |||
17 | 17 | ||
18 | # default to disabled | 18 | # default to disabled |
19 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" | 19 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" |
20 | ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" | 20 | ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-eglibc-locale = "0" |
21 | 21 | ||
22 | #enable locale generation on these arches | 22 | #enable locale generation on these arches |
23 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | 23 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions |
@@ -29,16 +29,13 @@ LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | |||
29 | 29 | ||
30 | PR = "r22" | 30 | PR = "r22" |
31 | 31 | ||
32 | PKGSUFFIX = "" | 32 | PROVIDES = "virtual/libc-locale" |
33 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | ||
34 | 33 | ||
35 | PROVIDES = "virtual/libc-locale${PKGSUFFIX}" | 34 | PACKAGES = "localedef ${PN}-dbg" |
36 | |||
37 | PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg" | ||
38 | 35 | ||
39 | PACKAGES_DYNAMIC = "locale-base-* \ | 36 | PACKAGES_DYNAMIC = "locale-base-* \ |
40 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ | 37 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ |
41 | glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" | 38 | glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" |
42 | 39 | ||
43 | # Create a eglibc-binaries package | 40 | # Create a eglibc-binaries package |
44 | ALLOW_EMPTY_${BPN}-binaries = "1" | 41 | ALLOW_EMPTY_${BPN}-binaries = "1" |
@@ -67,7 +64,7 @@ DESCRIPTION_localedef = "eglibc: compile locale definition files" | |||
67 | # Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. | 64 | # Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. |
68 | FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" | 65 | FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" |
69 | FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" | 66 | FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" |
70 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" | 67 | FILES_localedef = "${bindir}/localedef" |
71 | 68 | ||
72 | LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" | 69 | LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" |
73 | 70 | ||
@@ -93,6 +90,6 @@ do_install () { | |||
93 | 90 | ||
94 | inherit libc-package | 91 | inherit libc-package |
95 | 92 | ||
96 | do_install[depends] += "virtual/${MLPREFIX}libc${PKGSUFFIX}:do_populate_sysroot" | 93 | do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot" |
97 | 94 | ||
98 | BBCLASSEXTEND = "nativesdk" | 95 | BBCLASSEXTEND = "nativesdk" |