jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chroot-glibc: fix build/install; set proper perms to ldd.

Browse source
This commit is contained in:
Juan RP 2013-04-17 14:43:14 +02:00
parent be978ef0eb
commit 706231fd27
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/chroot-glibc/template
View file

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