Index: lib/tc_command.sh
===================================================================
RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/lib/tc_command.sh,v
retrieving revision 1.122
diff -u -r1.122 tc_command.sh
--- lib/tc_command.sh	11 May 2009 19:31:54 -0000	1.122
+++ lib/tc_command.sh	6 Jul 2009 17:27:28 -0000
@@ -27,7 +27,7 @@
 # $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.122 2009/05/11 19:31:54 beat Exp $
 #
 
-export _defaultUpdateHost="cvsup17.FreeBSD.org"
+export _defaultUpdateHost="cvsup7.ru.FreeBSD.org"
 export _defaultUpdateType="CSUP"
 
 #---------------------------------------------------------------------------
@@ -694,12 +694,12 @@
     echo "${jailName}: making world"
 
     # determine if we're cross-building world
-    crossEnv=""
+    crossEnv="NO_FSCHG=yes"
     if [ "${jailArch}" != "${myArch}" ]; then
-	crossEnv="TARGET_ARCH=${jailArch}"
+	crossEnv="${crossEnv} TARGET_ARCH=${jailArch}"
     fi
     cd ${SRCBASE} && env DESTDIR=${J_TMPDIR} ${crossEnv} \
-	make world > ${jailBase}/world.tmp 2>&1
+	make -j3 world > ${jailBase}/world.tmp 2>&1
     rc=$?
     execute_hook "postJailBuild" "JAIL=${jailName} DESTDIR=${J_TMPDIR} JAIL_ARCH=${jailArch} MY_ARCH=${myArch} JAIL_OBJDIR=${JAIL_OBJDIR} SRCBASE=${SRCBASE} PB=${pb} RC=${rc}"
     if [ ${rc} -ne 0 ]; then
@@ -1131,6 +1131,14 @@
     fi
 }
 
+wrap () {
+	cp $1 $1.orig
+	cat > $1 << _END
+#!/bin/sh
+\$0.orig \$@ | sed -e 's|amd64|i386|g'
+_END
+}
+
 makeBuild () {
     # set up defaults
     buildName=""
@@ -1184,6 +1192,12 @@
     echo "makeBuild: extracting jail tarball"
     tar -C ${BUILD_DIR} -xpf ${JAIL_TARBALL}
 
+    if echo ${jailName} | grep -q i386; then
+       ln -s ld-elf.so.1 ${BUILD_DIR}/libexec/ld-elf32.so.1
+       wrap ${BUILD_DIR}/usr/bin/uname
+       wrap ${BUILD_DIR}/sbin/sysctl
+    fi
+
     execute_hook "postBuildExtract" "BUILD=${buildName} DESTDIR=${BUILD_DIR} JAIL=${jailName} PB=${pb} RC=0"
 
     # Finalize environment
@@ -1436,6 +1450,13 @@
 	fi
     fi
 
+    # install libmap
+    if [ `echo ${jail} | cut -b 1` -lt 7 ]; then
+        echo 'libpthread.so.1 libthr.so.1' > ${buildRoot}/etc/libmap.conf
+        echo 'libpthread.so.2 libthr.so.2' >> ${buildRoot}/etc/libmap.conf
+        echo 'libkse.so.3 libthr.so.3' >> ${buildRoot}/etc/libmap.conf
+    fi
+
     if [ ${OPTIONS_ENABLED} -eq 1 ]; then
 	optionsDir=$(tinderLoc options ${build})