Another recent WITH_META_MODE= gotcha ": handling svn commit: r334008 - head/bin/sh

[M&S - Krasznai András]

Hi

I found another problem with compiling FreeBSD-CURRENT

when I tried to compile GENERIC instead of my custom I run into the following:

make installworld fails with 

/bin/sh: /usr/obj/usr/src/amd64.amd64/rescue/rescue/rescue: not found
rescue/sh check failed, installation aborted. 

I used originally a customized src.conf which - among others - specifies WITHOUT_RESCUE.
When trying to compile GENERIC I removed src.conf and I thought I would get a complete FreeBSD-CURRENT with GENERIC, with rescue files, etc. 

The source tree is at r334200


best regards

András Krasznai


-----Eredeti üzenet-----
Feladó: owner-freebsd-current at freebsd.org [mailto:owner-freebsd-current at freebsd.org] Meghatalmazó Bryan Drewery
Küldve: 2018. május 24. 20:50
Címzett: Mark Millard; FreeBSD Current
Másolatot kap: Cy.Schubert at cschubert.com; O. Hartmann
Tárgy: Re: Another recent WITH_META_MODE= gotcha ": handling svn commit: r334008 - head/bin/sh

On 5/21/2018 10:17 PM, Mark Millard wrote:
> Attempting to build head -r334014 from -r333947 includes the code from 
> -r334008, and for which I get:
> 
> --- parser.o ---
> /usr/src/bin/sh/parser.c:1440:9: error: use of undeclared identifier 'CQNL'
>                         case CQNL:
>                              ^
> 1 error generated.
> 
> for what was added in -r334008.
> 
> # grep -r CQNL /usr/src/* | more
> /usr/src/bin/sh/mksyntax.c:     { "CQNL",       "newline character in quotes" },
> /usr/src/bin/sh/mksyntax.c:     add("\n", "CQNL");
> /usr/src/bin/sh/mksyntax.c:     add("\n", "CQNL");
> /usr/src/bin/sh/mksyntax.c:     add("\n", "CQNL");
> /usr/src/bin/sh/parser.c:                       case CQNL:
> /usr/src/contrib/libarchive/libarchive/test/test_read_format_rar_binar
> y_data.rar.uu:M+M7)?9;.A%CQNL-+4::&_UJQ*P"PPW:>)I5*8)7^>6(\]!Q"^9YCE>>
> `9OG8
> 
> Apparently this is something WITH_META_MODE= does not deal with.
> Rebuilding after:
> 
> rm -fr /usr/obj/amd64_clang/*
> 
> (here I normally have the build materials) built fine.
> 
> (The "Making top.local.h from /usr/src/contrib/top/top.local.hs"
> change to no longer have top.local.h or top.local.hs was another
> example: for a while top.local.h was still referenced and old ones 
> would still be used if present.)
> 

It was a bug with the rescue build with dependency handling. I've fixed it in r334177.


--
Regards,
Bryan Drewery