jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibc: install localedef because the installer needs it

Browse Source 
Looks like I cocked this up first with #1616 and then #1686.
This commit is contained in:
MilhouseVH 2018-05-16 03:00:05 +01:00
parent ab60ac71fc
commit d6626b2f48
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ pre_configure_target() {
export BUILD_CC=$HOST_CC export BUILD_CC=$HOST_CC
export OBJDUMP_FOR_HOST=objdump export OBJDUMP_FOR_HOST=objdump
cat >config.cache <<EOF cat >config.cache <<EOF
libc_cv_forced_unwind=yes libc_cv_forced_unwind=yes
libc_cv_c_cleanup=yes libc_cv_c_cleanup=yes
libc_cv_ssp=no libc_cv_ssp=no
@ -101,13 +101,21 @@ libc_cv_ssp_strong=no
libc_cv_slibdir=/usr/lib libc_cv_slibdir=/usr/lib
EOF EOF
echo "libdir=/usr/lib" >> configparms cat >configparms <<EOF
echo "slibdir=/usr/lib" >> configparms libdir=/usr/lib
echo "sbindir=/usr/bin" >> configparms slibdir=/usr/lib
echo "rootsbindir=/usr/bin" >> configparms sbindir=/usr/bin
echo "build-programs=yes" >> configparms rootsbindir=/usr/bin
build-programs=yes
EOF
GLIBC_INCLUDE_BIN="getent ldd locale" # binaries to install into target
GLIBC_INCLUDE_BIN="getent ldd locale"
# Generic "installer" needs localedef to define drawing chars
if [ "$PROJECT" = "Generic" ]; then
GLIBC_INCLUDE_BIN+=" localedef"
fi
} }
post_makeinstall_target() { post_makeinstall_target() {
@ -117,14 +125,7 @@ post_makeinstall_target() {
# cleanup # cleanup
# remove any programs we don't want/need, keeping only those we want # remove any programs we don't want/need, keeping only those we want
for f in $(find $INSTALL/usr/bin -type f); do for f in $(find $INSTALL/usr/bin -type f); do
fb="$(basename "${f}")" listcontains "${GLIBC_INCLUDE_BIN}" "$(basename "${f}")" || rm -fr "${f}"
for ib in $GLIBC_INCLUDE_BIN; do
if [ "${ib}" == "${fb}" ]; then
fb=
break
fi
done
[ -n "${fb}" ] && rm -rf ${f}
done done
rm -rf $INSTALL/usr/lib/audit rm -rf $INSTALL/usr/lib/audit