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

glibc: add 32 dynamic linker to ldd on x86_64.

Browse source 
replace_interpreter: don't look at $wrksrc.

--HG--
extra : convert_revision : ba36faca11a84e42a6cbd418be90cbd443a5ee4e
This commit is contained in:
Juan RP 2008-11-03 10:32:36 +01:00
parent 5b8cc70d4e
commit 9b1c29e19b
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helpers/replace-interpreter.sh
View file

@ -37,7 +37,7 @@ replace_interpreter()
;; ;;
esac esac
if [ -f $wrksrc/$file ]; then if [ -f $file ]; then
sed -i -e "1s|^#![[:space:]]*${orsb}|#!${trpath}|" $file && \ sed -i -e "1s|^#![[:space:]]*${orsb}|#!${trpath}|" $file && \
msg_normal "Transformed $lang script: ${file##$wrksrc}." msg_normal "Transformed $lang script: ${file##$wrksrc}."
else else

30
templates/glibc.tmpl
View file

@ -4,13 +4,11 @@ version=2.8
wrksrc="libc" wrksrc="libc"
distfiles="ftp://ftp.archlinux.org/other/glibc/$pkgname-2.8_20080828.tar.bz2" distfiles="ftp://ftp.archlinux.org/other/glibc/$pkgname-2.8_20080828.tar.bz2"
build_style=gnu_configure build_style=gnu_configure
configure_env="ac_cv_path_BASH_SHELL=/bin/bash"
configure_script="../configure" configure_script="../configure"
configure_args="--with-tls -disable-profile --with-__thread configure_args="--with-tls -disable-profile --with-__thread
--enable-kernel=2.6.16 --enable-add-ons --without-gd --enable-bind-now --enable-kernel=2.6.16 --enable-add-ons --without-gd --enable-bind-now
--without-cvs --without-selinux --prefix=/usr --libdir=/usr/lib --without-cvs --without-selinux --prefix=/usr --libdir=/usr/lib
--with-headers=/usr/include --with-headers=/usr/include --infodir=/usr/share/info"
--infodir=/usr/share/info"
make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install
localedata/install-locales" localedata/install-locales"
short_desc="The GNU C library" short_desc="The GNU C library"
@ -32,31 +30,31 @@ pre_configure()
# We must configure it in another directory. # We must configure it in another directory.
mkdir -p $wrksrc/build_obj && cd $wrksrc/build_obj mkdir -p $wrksrc/build_obj && cd $wrksrc/build_obj
wrksrc=$wrksrc/build_obj wrksrc=$wrksrc/build_obj
echo "slibdir=/lib" >> $wrksrc/configparms echo "slibdir=/lib" > $wrksrc/configparms
} }
pre_install() pre_install()
{ {
# Create destdir/etc/ld.conf # Create destdir/etc/ld.so.conf
mkdir -p $XBPS_DESTDIR/$pkgname-$version/etc mkdir -p $XBPS_DESTDIR/$pkgname-$version/etc
touch $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf touch $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf
} }
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version
# Replace hardcoded path to bash. # Replace hardcoded path to bash.
# x86_64 arch: use /lib rather than /lib64 and make . $XBPS_HELPERSDIR/replace-interpreter.sh
# lib64 -> lib symlinks. replace_interpreter bash $destdir/usr/bin/ldd
if [ -x $XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd ]; then
sed -i -e "s,$XBPS_MASTERDIR/bin/bash,/bin/bash,g" \
$XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd
fi
# On x86_64, use /lib rather than /lib64 and add the
# dynamic linker's 32bit version.
if [ "$xbps_machine" = "x86_64" ]; then if [ "$xbps_machine" = "x86_64" ]; then
sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' \ rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
$XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
cd $XBPS_DESTDIR/$pkgname-$version && ln -s lib lib64 $destdir/usr/bin/ldd
cd $XBPS_DESTDIR/$pkgname-$version/usr && ln -s lib lib64 cd $destdir && ln -s lib lib64
cd $destdir/usr && ln -s lib lib64
fi fi
} }