Date: Mon, 3 Mar 2014 09:12:06 -0500 From: John Baldwin <jhb@freebsd.org> To: Glen Barber <gjb@freebsd.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r262660 - projects/release-embedded/release Message-ID: <201403030912.06379.jhb@freebsd.org> In-Reply-To: <201403011744.s21HifpG083123@svn.freebsd.org> References: <201403011744.s21HifpG083123@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403030912.06379.jhb>