ports-mgmt/tinderbox: fix i386 jail on amd64 host on 9-CURRENT

[Alexey Shuvaev]

Hello!

I've recently bumped into the issue which was already discussed
on current@:
http://lists.freebsd.org/pipermail/freebsd-current/2010-July/018638.html

In short, in the ports' tinderbox, i386 jail fails on the amd64 host
during "make distribution" step. This configuration, while
not strictly supported, is rather usefull.

It looks like it hasn't been fixed in the repository or in ports.
I can confirm that the proposed patch:
http://lists.freebsd.org/pipermail/freebsd-current/2010-July/018676.html
fixes the build of i386 jail on amd64 host.
Attached is an updated patch-lib-tc_command.sh.new which could be
dropped into the files directory of ports-mgmt/tinderbox port
instead of the current file.

Could interested people (cc-ed) check it on other releases and
propagate it upstream?

Thanks,
Alexey.
-------------- next part --------------
--- lib/tc_command.sh.orig	2009-11-27 18:32:31.000000000 +0100
+++ lib/tc_command.sh	2010-09-07 16:50:24.000000000 +0200
@@ -223,7 +223,7 @@
 #---------------------------------------------------------------------------
 
 Setup () {
-    MAN_PREREQS="lang/perl5.[81]"
+    MAN_PREREQS="lang/perl5.[81]*"
     OPT_PREREQS="lang/php[45] databases/pear-MDB2 www/php[45]-session"
     PREF_FILES="tinderbox.ph"
     README="$(tinderLoc scripts README)"
@@ -774,10 +774,10 @@
         # determine if we're cross-building world
         crossEnv=""
         if [ "${jailArch}" != "${myArch}" ]; then
-	    crossEnv="TARGET_ARCH=${jailArch} MACHINE_ARCH=${jailArch} MAKEOBJDIRPREFIX=${J_OBJDIR}/${jailArch} MACHINE=${jailArch}"
+	    crossEnv="TARGET_ARCH=${jailArch}"
         fi
-        cd ${SRCBASE}/etc && env DESTDIR=${J_TMPDIR} ${crossEnv} \
-	    make -m ${J_TMPDIR}/usr/share/mk distribution > ${jailBase}/distribution.tmp 2>&1
+        cd ${SRCBASE} && env DESTDIR=${J_TMPDIR} ${crossEnv} \
+	    make distribution > ${jailBase}/distribution.tmp 2>&1
         if [ $? -ne 0 ]; then
 	    echo "ERROR: distribution failed - see ${jailBase}/distribution.tmp"
 	    buildJailCleanup 1 ${jailName} ${J_SRCDIR}