From owner-svn-src-projects@FreeBSD.ORG  Mon Mar  3 15:04:15 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5A03BE71;
 Mon,  3 Mar 2014 15:04:15 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3C4C205;
 Mon,  3 Mar 2014 15:04:14 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1C530B94C;
 Mon,  3 Mar 2014 10:04:08 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Glen Barber <gjb@freebsd.org>
Subject: Re: svn commit: r262660 - projects/release-embedded/release
Date: Mon, 3 Mar 2014 09:12:06 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; )
References: <201403011744.s21HifpG083123@svn.freebsd.org>
In-Reply-To: <201403011744.s21HifpG083123@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201403030912.06379.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Mon, 03 Mar 2014 10:04:08 -0500 (EST)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 15:04:15 -0000

On Saturday, March 01, 2014 12:44:41 pm Glen Barber wrote:
> Author: gjb
> Date: Sat Mar  1 17:44:40 2014
> New Revision: 262660
> URL: http://svnweb.freebsd.org/changeset/base/262660
> 
> Log:
>   If building i386/i386 on amd64/amd64, append TARGET=i386 and
>   TARGET_ARCH=i386 to CHROOT_MAKEENV, ensuring the i386 build
>   is done within a true i386 build environment.
>   
>   Sponsored by:	The FreeBSD Foundation
> 
> Modified:
>   projects/release-embedded/release/release.sh
> 
> Modified: projects/release-embedded/release/release.sh
> ==============================================================================
> --- projects/release-embedded/release/release.sh	Sat Mar  1 17:36:10 2014	(r262659)
> +++ projects/release-embedded/release/release.sh	Sat Mar  1 17:44:40 2014	(r262660)
> @@ -147,6 +147,13 @@ else
>  	ARCH_FLAGS=
>  fi
>  CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
> +if [ ! -z ${TARGET} ] && [ ! -z ${TARGET_ARCH} ] && \
> +	[ ${TARGET} = "i386" ] && \
> +	[ ${TARGET_ARCH} = "i386" ] && \
> +	[ "$(sysctl -n hw.machine)" = "amd64" ] && \
> +	[ "$(sysctl -n hw.machine_arch)" = "amd64" ]; then
> +		CHROOT_MAKEENV="${CHROOT_MAKEENV} TARGET=i386 TARGET_ARCH=i386"
> +fi

You can remove the -z checks if you add some quotes:

if [ "$TARGET" = "i386" -a "$TARGET_ARCH" = "i386" ]

etc.

However, this seems a bit hackish to hardcode this only for i386.  Wouldn't
this also apply to building powerpc on powerpc64?  Or rather, does this mean
you don't trust cross-built releases?  cross-built releases should work (and
if they don't, they should be fixed)

-- 
John Baldwin