glibc: use XBPS_TARGET_MACHINE, which dtrt in cross builds.
This commit is contained in:
parent
5c6a78d92d
commit
6aa0b68f6e
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'glibc'
|
# Template file for 'glibc'
|
||||||
pkgname=glibc
|
pkgname=glibc
|
||||||
version=2.17
|
version=2.17
|
||||||
revision=5
|
revision=6
|
||||||
short_desc="The GNU C library"
|
short_desc="The GNU C library"
|
||||||
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"
|
||||||
|
@ -86,7 +86,7 @@ do_install() {
|
||||||
replace_interpreter bash ${DESTDIR}/usr/bin/ldd
|
replace_interpreter bash ${DESTDIR}/usr/bin/ldd
|
||||||
|
|
||||||
# On x86_64, add dynamic linker's 32bit version to ldd.
|
# On x86_64, add dynamic linker's 32bit version to ldd.
|
||||||
if [ "$XBPS_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
|
||||||
|
@ -100,7 +100,7 @@ do_install() {
|
||||||
vmove "sbin/*" usr/sbin
|
vmove "sbin/*" usr/sbin
|
||||||
|
|
||||||
# Create ld-linux.so.3 symlink for ARM.
|
# Create ld-linux.so.3 symlink for ARM.
|
||||||
if [ "$XBPS_MACHINE" = "armv6l" ]; then
|
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
|
||||||
ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 \
|
ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 \
|
||||||
${DESTDIR}/usr/lib/ld-linux.so.3
|
${DESTDIR}/usr/lib/ld-linux.so.3
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue