Re: [for 0.1 release 03/11] build/boot/roms: skip building gnat on fam15h

[Leah Rowe]

i've sent a follow-up v2 version of this patch, because the original of
this patch (for 0.1 buildfix series) did not set crossgcc_ada="n" on
actual boards, which is required, otherwise gnat isn't skipped.

the v2 patch is identical but sets crossgcc_ada="n" for real, on each
amd board

On Tue, 16 Jan 2024 01:24:43 +0000
Leah Rowe via Gnuboot-patches <gnuboot-patches@gnu.org> wrote:

> From: Leah Rowe <leah@libreboot.org>
> 
> the fam15h boards do not use libgfxinit, instead deferring
> to coreboot's old style of graphics initialisation written in C.
> 
> libgfxinit is otherwise the only thing that needs gcc-gnat, so
> skip building gcc-gnat on coreboot/fam15h_udimm and rdimm.
> 
> neox added crossgcc_ada="n" to board.cfg files before, but
> forgot to add the handling of it, so these boards still didn't
> build on modern distros, where building the old gnat version
> was problematic.
> 
> with this patch, those fam15h boards should now build, on modern
> distros and modern toolchains. this is done by using
> the BUILD_LANGUAGES environmental variable, setting it to c,
> which tells coreboot to skip building gcc-gnat.
> 
> Signed-off-by: Leah Rowe <leah@libreboot.org>
> ---
>  resources/packages/roms_helper/boot | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/resources/packages/roms_helper/boot
> b/resources/packages/roms_helper/boot index db393e0..03d9409 100755
> --- a/resources/packages/roms_helper/boot
> +++ b/resources/packages/roms_helper/boot
> @@ -63,9 +63,14 @@ payload_seabios="n"
>  payload_seabios_withgrub="n" # i386-coreboot grub accessible from
> SeaBIOS boot menu seabios_opromloadonly="0"
>  payload_memtest="n"
> +crossgcc_ada="y"
>  # Override the above defaults using board.cfg
>  source "resources/coreboot/${board}/board.cfg"
>  
> +if [ "${crossgcc_ada}" != "n" ] && [ "${crossgcc_ada}" != "y" ]; then
> +     crossgcc_ada="y"
> +fi
> +
>  if [ "${grub_scan_disk}" = "undefined" ]; then
>       printf "build/roms: Target %s does not define
> grub_scan_disk. Defaulting to 'both'.\n" "${board}"
> grub_scan_disk="both" @@ -142,12 +147,11 @@ fi
>  
>  if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
>       if [ ! -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ]; then
> -             (
> -                     cat version > "${cbdir}/.coreboot-version"
> -                     cd "${cbdir}"
> -                     make crossgcc-i386 CPUS=$(nproc) # even for
> 64-bit machines, coreboot builds
> -                             # 32-bit ROM images, so we only need
> to worry about i386-elf
> -             )
> +             cat version > "${cbdir}/.coreboot-version"
> +             if [ "${crossgcc_ada}" = "n" ]; then
> +                     export BUILD_LANGUAGES=c
> +             fi
> +             make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc)
>       fi
>  elif [ "${arch}" = "ARMv7" ]; then
>       cat version > "${cbdir}/.coreboot-version"
> -- 
> 2.39.2
> 


-- 
Leah Rowe,
Company Director,
Minifree Ltd

Registered in England, registration No. 9361826
VAT Registration No. GB202190462
Minifree Ltd, 19 Hilton Road, Canvey Island
Essex SS8 9QA, United Kingdom
United Kingdom

pgpPDn5_MBTJW.pgp
Description: PGP signature