|
|
|
@ -308,11 +308,32 @@ glibc_custmain() { |
|
|
|
$configure_without_tls --cache-file=config.cache \ |
|
|
|
--build=${temp_arch_build} --host=${temp_arch_target} |
|
|
|
|
|
|
|
# No wrong absolute path in *.so linker scripts |
|
|
|
# this must be called from glibc makefile right after installing usr/lib/libc.so |
|
|
|
# |
|
|
|
if [ -d $root/ROCK/tools.cross -a -z "$pkg_glibc_cross" ]; then |
|
|
|
export ROCK_FIXUP_CROSS_LIBC_SO=$builddir/fixup-cross-libc-so.sh |
|
|
|
cat << EOT > $builddir/fixup-cross-libc-so.sh |
|
|
|
if [ -f $root/$prefix/lib/libc.so ]; then |
|
|
|
echo "Fixing $root/ROCK/tools.cross/$arch_target/lib/libc.so." |
|
|
|
rm -f $root/ROCK/tools.cross/$arch_target/lib/libc.so |
|
|
|
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libc.so > $root/ROCK/tools.cross/$arch_target/lib/libc.so |
|
|
|
fi |
|
|
|
if [ -f $root/$prefix/lib/libpthread.so ]; then |
|
|
|
echo "Fixing $root/ROCK/tools.cross/$arch_target/lib/libpthread.so." |
|
|
|
rm -f $root/ROCK/tools.cross/$arch_target/lib/libpthread.so |
|
|
|
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libpthread.so > $root/ROCK/tools.cross/$arch_target/lib/libpthread.so |
|
|
|
fi |
|
|
|
EOT |
|
|
|
chmod +x $builddir/fixup-cross-libc-so.sh |
|
|
|
fi |
|
|
|
|
|
|
|
eval $MAKE prefix=/usr slibdir=/lib sysconfdir=/etc all |
|
|
|
eval $MAKE prefix=/$prefix slibdir=/lib \ |
|
|
|
sysconfdir=/etc install_root=$root install |
|
|
|
|
|
|
|
ln -sf libbsd-compat.a $root/$prefix/lib/libbsd.a |
|
|
|
$builddir/fixup-cross-libc-so.sh |
|
|
|
|
|
|
|
# install locales |
|
|
|
# |
|
|
|
@ -331,15 +352,6 @@ glibc_custmain() { |
|
|
|
cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/ |
|
|
|
install_init nscd $confdir/nscd.init |
|
|
|
|
|
|
|
# No wrong absolute path in *.so linker scripts |
|
|
|
# |
|
|
|
if [ -d $root/ROCK/tools.cross -a -z "$pkg_glibc_cross" ]; then |
|
|
|
rm -f $root/ROCK/tools.cross/$arch_target/lib/libc.so |
|
|
|
rm -f $root/ROCK/tools.cross/$arch_target/lib/libpthread.so |
|
|
|
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libc.so > $root/ROCK/tools.cross/$arch_target/lib/libc.so |
|
|
|
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libpthread.so > $root/ROCK/tools.cross/$arch_target/lib/libpthread.so |
|
|
|
fi |
|
|
|
|
|
|
|
# Install ld.so.conf |
|
|
|
# |
|
|
|
if [ ! -f $root/etc/ld.so.conf ] |
|
|
|
@ -390,8 +402,23 @@ glibc_stage0() { |
|
|
|
var_append confopt " " "--enable-add-ons"$ADDONS" --build=\$arch_build \ |
|
|
|
--host=\$arch_target" |
|
|
|
|
|
|
|
# in stage 0 we do not have the cross compiler yet. |
|
|
|
# some configure checks which would fail without |
|
|
|
# a working cross compiler in stage 0.. |
|
|
|
export libc_cv_mlong_double_128=yes |
|
|
|
export libc_cv_mlong_double_128ibm=yes |
|
|
|
export libc_cv_mabi_ibmlongdouble=yes |
|
|
|
export libc_cv_ppc_machine=yes |
|
|
|
|
|
|
|
# more configure hacks: tls support everywhere |
|
|
|
for x in $( find .. -name configure | xargs grep libc_cv_.*_tls | \ |
|
|
|
sed -r 's,.*(libc_cv),\1,; s,(_tls).*,\1,' | sort -u; ) |
|
|
|
do eval "export $x=yes"; done |
|
|
|
|
|
|
|
# due to assembler check - and we do not yet have as ... |
|
|
|
[ $arch = hppa ] && var_append confopt " " "--enable-hacker-mode" |
|
|
|
if [ $arch = hppa ]; then |
|
|
|
var_append confopt " " "--enable-hacker-mode" |
|
|
|
fi |
|
|
|
|
|
|
|
eval "../configure --enable-add-ons"$ADDONS" $confopt" |
|
|
|
|
|
|
|
|
Clifford Wolf
17 years ago