svn commit: r262660 - projects/release-embedded/release
John Baldwin
jhb at freebsd.org
Mon Mar 3 15:04:15 UTC 2014
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
More information about the svn-src-projects
mailing list