Browse Source

Changed glibc to use an separate 'objdir' per buildloop

- Since we build 32bit libs of glibc by using a second buildloop
  if we build a multilib target, we have to assure that we build
  64 and 32bit libs in separate directories.
early
Christian Wiese 18 years ago
parent
commit
3047733dbc
  1. 25
      base/glibc/glibc.conf

25
base/glibc/glibc.conf

@ -37,9 +37,13 @@ var_insert GCC_WRAPPER_REMOVE " " "-ffast-math"
# Disable glibc internal debuging but build debuging and profile # Disable glibc internal debuging but build debuging and profile
# code so we can use this glibc to debug other programs. # code so we can use this glibc to debug other programs.
hook_add preconf 3 "mkdir -p objdir; cd objdir" pkg_glibc_preconf(){
mkdir -p "$builddir/objdir-$buildloop"
cd "$builddir/objdir-$buildloop"
configprefix='CFLAGS="$CFLAGS -g -DNDEBUG=1"' configprefix='CFLAGS="$CFLAGS -g -DNDEBUG=1"'
configscript="../configure" configscript="../$pkg-$ver/configure"
}
hook_add preconf 3 "pkg_glibc_preconf"
var_append confopt " " "--with-gnu-binutils --build=${arch_build} --host=${arch_target}" var_append confopt " " "--with-gnu-binutils --build=${arch_build} --host=${arch_target}"
@ -112,7 +116,7 @@ glibc_prepatch() {
glibc_postmake() glibc_postmake()
{ {
if atstage toolchain; then if atstage toolchain; then
cp -v ../include/features.h $root$includedir cp -v $builddir/$pkg-$ver/include/features.h $root$includedir
mkdir -p $includedir/{bits,gnu} mkdir -p $includedir/{bits,gnu}
[ -e $root$includedir/bits/stdio_lim.h ] || [ -e $root$includedir/bits/stdio_lim.h ] ||
touch $root$includedir/bits/stdio_lim.h touch $root$includedir/bits/stdio_lim.h
@ -128,29 +132,28 @@ glibc_postmake()
# install locales # install locales
# #
eval $MAKE localedata/install-locales eval $MAKE localedata/install-locales
cp ../localedata/SUPPORTED $root/usr/share/i18n/ cp $builddir/$pkg-$ver/localedata/SUPPORTED $root/usr/share/i18n/
if [ "$SDECFG_PKG_GLIBC_TLS" != 1 ]; then if [ "$SDECFG_PKG_GLIBC_TLS" != 1 ]; then
# install linuxthread manpages # install linuxthread manpages
# #
mkdir -p $root/usr/share/man/man3 mkdir -p $root/usr/share/man/man3
if [ -f /usr/bin/perl ]; then if [ -f /usr/bin/perl ]; then
eval $MAKE -C ../linuxthreads/man \ eval $MAKE -C $builddir/$pkg-$ver/linuxthreads/man \
MANDIR=$root/usr/share/man/man3 all install MANDIR=$root/usr/share/man/man3 all install
fi fi
# copy linuxthreads documentation # copy linuxthreads documentation
# #
cp ../linuxthreads/ChangeLog $docdir/ChangeLog.threads for x in ChangeLog Changes README FAQ.html Examples; do
cp ../linuxthreads/Changes $docdir/Changes.threads cp -a $builddir/$pkg-$ver/linuxthreads/$x \
cp ../linuxthreads/README $docdir/README.threads $docdir/$x.threads
cp ../linuxthreads/FAQ.html $docdir/FAQ-threads.html done
cp -r ../linuxthreads/Examples $docdir/examples.threads
fi fi
# copy crypt documentation # copy crypt documentation
# #
cp ../crypt/README.ufc-crypt $docdir/README.crypt cp $builddir/$pkg-$ver/crypt/README.ufc-crypt $docdir/README.crypt
# NSCD Init script and config # NSCD Init script and config
# #

Loading…
Cancel
Save