summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-09-24 12:00:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-25 10:41:28 +0100
commit6ee9ebc42575d24bc5bcd5da175c81e4ea7ccb38 (patch)
treec9865126c092d3d78b3c800c2b80b19ce9b49499 /meta/recipes-core
parentd02f02950ef4aff9ef9726cc364dd041e514fd3a (diff)
downloadpoky-6ee9ebc42575d24bc5bcd5da175c81e4ea7ccb38.tar.gz
Add and use 'localedir' variable
This avoids the hardcoding of ${libdir}/locale which is all over the place, and will facilitate use of ${exec_prefix}/lib/locale instead of ${libdir}/locale. This doesn't actually change any output at this time. Verified this with buildhistory against the packages produced from core-image-base. (From OE-Core rev: b744f4cc2912334b8493a89525fd02af8e9b8edf) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc6
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc11
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc1
3 files changed, 12 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 296afdef6e..105cf2efd3 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -69,12 +69,12 @@ FILES_localedef = "${bindir}/localedef"
69LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" 69LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
70 70
71do_install () { 71do_install () {
72 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} 72 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} ${D}${localedir}
73 if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then 73 if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
74 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} 74 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
75 fi 75 fi
76 if [ -e ${LOCALETREESRC}/${libdir}/locale ]; then 76 if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
77 cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir} 77 cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
78 fi 78 fi
79 if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then 79 if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
80 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} 80 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index ab7540afb4..0059bcfc1c 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,7 +98,9 @@ do_install_locale () {
98 if [ -e ${D}${libdir}/gconv ]; then 98 if [ -e ${D}${libdir}/gconv ]; then
99 mv -f ${D}${libdir}/gconv ${dest}${libdir} 99 mv -f ${D}${libdir}/gconv ${dest}${libdir}
100 fi 100 fi
101 cp -fpPR ${D}${libdir}/* ${dest}${libdir} 101 if [ -e ${D}${exec_prefix}/lib ]; then
102 cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
103 fi
102 if [ -e ${D}${datadir}/i18n ]; then 104 if [ -e ${D}${datadir}/i18n ]; then
103 mv ${D}${datadir}/i18n ${dest}${datadir} 105 mv ${D}${datadir}/i18n ${dest}${datadir}
104 fi 106 fi
@@ -113,6 +115,9 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
113 115
114eglibc_package_preprocess () { 116eglibc_package_preprocess () {
115 rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} 117 rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
116 rm -rf ${PKGD}/${libdir}/locale 118 rm -rf ${PKGD}/${localedir}
119 if [ "${libdir}" != "${exec_prefix}/lib" ]; then
120 # This dir only exists to hold locales
121 rm -rf ${PKGD}${exec_prefix}/lib
122 fi
117} 123}
118
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 29e303fafd..cae955d523 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -34,6 +34,7 @@ LEAD_SONAME = "libc.so"
34 34
35CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \ 35CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
36 ac_cv_path_BASH_SHELL=${base_bindir}/bash \ 36 ac_cv_path_BASH_SHELL=${base_bindir}/bash \
37 libc_cv_localedir=${localedir} \
37 libc_cv_ssp=no \ 38 libc_cv_ssp=no \
38 " 39 "
39 40