chroot-glibc: fix build/install; set proper perms to ldd.
This commit is contained in:
parent
be978ef0eb
commit
706231fd27
|
@ -3,7 +3,7 @@ pkgname=chroot-glibc
|
|||
_majorver=2.17
|
||||
version=${_majorver}
|
||||
wrksrc="glibc-${version}"
|
||||
revision=5
|
||||
revision=6
|
||||
short_desc="The GNU C library -- for xbps-src use"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.gnu.org/software/libc"
|
||||
|
@ -69,9 +69,10 @@ do_install() {
|
|||
# On x86_64, add dynamic linker's 32bit version to ldd.
|
||||
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
|
||||
rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
|
||||
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
|
||||
${DESTDIR}/usr/bin/ldd
|
||||
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" ${DESTDIR}/usr/bin/ldd
|
||||
fi
|
||||
chmod 755 ${DESTDIR}/usr/bin/ldd
|
||||
|
||||
vmkdir etc/ld.so.conf.d
|
||||
echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
|
||||
chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
|
||||
|
@ -82,7 +83,7 @@ do_install() {
|
|||
|
||||
# Switch to /usr.
|
||||
vmkdir usr/sbin
|
||||
vmove "sbin/*" usr/sbin
|
||||
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
|
||||
|
||||
# Create ld-linux.so.3 symlink for ARM.
|
||||
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
|
||||
|
@ -110,6 +111,7 @@ chroot-glibc_package() {
|
|||
conflicts="glibc>=0 glibc-devel>=0"
|
||||
noverifyrdeps=yes
|
||||
pkg_install() {
|
||||
vmove etc
|
||||
vmove usr
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue