From eb63eeac912186507c152497c4ef0e588c4cb442 Mon Sep 17 00:00:00 2001
From: Christian Wiese <morfoh@opensde.org>
Date: Sat, 6 Oct 2007 01:46:40 +0300
Subject: [PATCH] Changed glibc to create objdir-$arch_target inside srcdir

We have to use an 'objdir' directory for building glibc and make its
name unique by appending $arch_target to distinguish while building
a multilib capable glibc using buildloops.
---
 base/glibc/glibc.conf | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index e2c68f2e0..6734ac772 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -33,18 +33,23 @@ var_insert GCC_WRAPPER_INSERT " " "-O"
 # glibc does not like -ffast-math
 var_insert GCC_WRAPPER_REMOVE " " "-ffast-math"
 
-# We must use an 'objdir' directory for building glibc
 # Disable glibc internal debuging but build debuging and profile
 # code so we can use this glibc to debug other programs.
-
 pkg_glibc_preconf(){
-	mkdir -p "$builddir/objdir-$buildloop"
-	cd "$builddir/objdir-$buildloop"
 	configprefix='CFLAGS="$CFLAGS -g -DNDEBUG=1"'
-	configscript="../$pkg-$ver/configure"
+	configscript="../configure"
 }
 hook_add preconf 3 "pkg_glibc_preconf"
 
+# We have to use an 'objdir' directory for building glibc and make its
+# name unique by appending $arch_target to distinguish while building
+# a multilib capable glibc using buildloops.
+pkg_glibc_objdir(){
+	mkdir -p "objdir-$arch_target"
+	cd "objdir-$arch_target"
+}
+hook_add preconf 9 "pkg_glibc_objdir"
+
 var_append confopt " " "--with-gnu-binutils --build=${arch_build} --host=${arch_target}"
 
 if pkginstalled libgd; then
@@ -116,7 +121,7 @@ glibc_prepatch() {
 glibc_postmake()
 {
 	if atstage toolchain; then
-	  cp -v $builddir/$pkg-$ver/include/features.h $root$includedir
+	  cp -v ../include/features.h $root$includedir
 	  mkdir -p $includedir/{bits,gnu}
 	  [ -e $root$includedir/bits/stdio_lim.h ] ||
 	  touch $root$includedir/bits/stdio_lim.h
@@ -132,28 +137,28 @@ glibc_postmake()
 		# install locales
 		#
 		eval $MAKE localedata/install-locales
-		cp $builddir/$pkg-$ver/localedata/SUPPORTED $root/usr/share/i18n/
+		cp ../localedata/SUPPORTED $root/usr/share/i18n/
 
 		if [ "$SDECFG_PKG_GLIBC_TLS" != 1 ]; then
 			# install linuxthread manpages
 			#
 			mkdir -p $root/usr/share/man/man3
 			if [ -f /usr/bin/perl ]; then
-				eval $MAKE -C $builddir/$pkg-$ver/linuxthreads/man \
+				eval $MAKE -C ../linuxthreads/man \
 					MANDIR=$root/usr/share/man/man3 all install
 			fi
 	
 			# copy linuxthreads documentation
 			#
 			for x in ChangeLog Changes README FAQ.html Examples; do
-				cp -a $builddir/$pkg-$ver/linuxthreads/$x \
+				cp -a ../linuxthreads/$x \
 					$docdir/$x.threads
 			done
 		fi
 
 		# copy crypt documentation
 		#
-		cp $builddir/$pkg-$ver/crypt/README.ufc-crypt   $docdir/README.crypt
+		cp ../crypt/README.ufc-crypt   $docdir/README.crypt
 		
 		# NSCD Init script and config
 		#