jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

locale: Use get_install_dir() instead of get_build_dir()

Browse Source
This commit is contained in:
Andre Heider 2019-12-22 11:27:07 +01:00
parent 84fb99e7ee
commit c5b5df0266
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/addons/service/locale/package.mk
View File

@ -16,12 +16,12 @@ PKG_ADDON_TYPE="xbmc.service"
addon() { addon() {
mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
cp -PR "$(get_build_dir glibc)/.$TARGET_NAME/locale/localedef" \ cp -PR "$(get_install_dir glibc)/.noinstall/localedef" \
"$ADDON_BUILD/$PKG_ADDON_ID/bin" "$ADDON_BUILD/$PKG_ADDON_ID/bin"
mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n" mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
cp -PR "$(get_build_dir glibc)/localedata/charmaps" \ cp -PR "$(get_install_dir glibc)/.noinstall/charmaps" \
"$(get_build_dir glibc)/localedata/locales" \ "$(get_install_dir glibc)/.noinstall/locales" \
"$ADDON_BUILD/$PKG_ADDON_ID/i18n" "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/locpath" mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/locpath"

20
packages/devel/glibc/package.mk
View File

@ -97,15 +97,20 @@ build-programs=yes
EOF EOF
# binaries to install into target # binaries to install into target
GLIBC_INCLUDE_BIN="getent ldd locale" GLIBC_INCLUDE_BIN="getent ldd locale localedef"
# Generic "installer" needs localedef to define drawing chars
if [ "$PROJECT" = "Generic" ]; then
GLIBC_INCLUDE_BIN+=" localedef"
fi
} }
post_makeinstall_target() { post_makeinstall_target() {
mkdir -p $INSTALL/.noinstall
cp -p $INSTALL/usr/bin/localedef $INSTALL/.noinstall
cp -a $INSTALL/usr/share/i18n/locales $INSTALL/.noinstall
mv $INSTALL/usr/share/i18n/charmaps $INSTALL/.noinstall
# Generic "installer" needs localedef to define drawing chars
if [ "$PROJECT" != "Generic" ]; then
rm $INSTALL/usr/bin/localedef
fi
# we are linking against ld.so, so symlink # we are linking against ld.so, so symlink
ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so
@ -122,9 +127,6 @@ post_makeinstall_target() {
safe_remove $INSTALL/usr/lib/*.map safe_remove $INSTALL/usr/lib/*.map
safe_remove $INSTALL/var safe_remove $INSTALL/var
# remove locales and charmaps
safe_remove $INSTALL/usr/share/i18n/charmaps
# add UTF-8 charmap for Generic (charmap is needed for installer) # add UTF-8 charmap for Generic (charmap is needed for installer)
if [ "$PROJECT" = "Generic" ]; then if [ "$PROJECT" = "Generic" ]; then
mkdir -p $INSTALL/usr/share/i18n/charmaps mkdir -p $INSTALL/usr/share/i18n/charmaps