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

glibc: use unified /usr

Browse Source
This commit is contained in:
Lukas Rusak 2016-12-04 13:23:41 -08:00
parent fb12c9fcf5
commit ca468b48ff
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,18 +109,18 @@ libc_cv_forced_unwind=yes
libc_cv_c_cleanup=yes libc_cv_c_cleanup=yes
libc_cv_ssp=no libc_cv_ssp=no
libc_cv_ssp_strong=no libc_cv_ssp_strong=no
libc_cv_slibdir=/lib libc_cv_slibdir=/usr/lib
EOF EOF
echo "libdir=/usr/lib" >> configparms echo "libdir=/usr/lib" >> configparms
echo "slibdir=/lib" >> configparms echo "slibdir=/usr/lib" >> configparms
echo "sbindir=/usr/bin" >> configparms echo "sbindir=/usr/bin" >> configparms
echo "rootsbindir=/usr/bin" >> configparms echo "rootsbindir=/usr/bin" >> configparms
} }
post_makeinstall_target() { post_makeinstall_target() {
# we are linking against ld.so, so symlink # we are linking against ld.so, so symlink
ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so
# cleanup # cleanup
for i in $GLIBC_EXCLUDE_BIN; do for i in $GLIBC_EXCLUDE_BIN; do
@ -157,7 +157,7 @@ post_makeinstall_target() {
cp $PKG_DIR/config/gai.conf $INSTALL/etc cp $PKG_DIR/config/gai.conf $INSTALL/etc
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
ln -sf ld.so $INSTALL/lib/ld-linux.so.3 ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
fi fi
} }
@ -171,14 +171,14 @@ make_init() {
} }
makeinstall_init() { makeinstall_init() {
mkdir -p $INSTALL/lib mkdir -p $INSTALL/usr/lib
cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/usr/lib
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/lib cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/usr/lib
cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/lib cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
ln -sf ld.so $INSTALL/lib/ld-linux.so.3 ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
fi fi
} }