svn commit: r324449 - in head/sys/boot: arm/uboot efi/boot1 sparc64/loader

[Warner Losh]

Can you find out? A clean build works for me. Chances are good that
sys/boot/efi/boot1/Makefile needs a line like
CFLAGS+=-I${SASRC} or similar. I have to go out for 2 hours, but will look
into when I get back if you can't make progress. I don't see one there and
I had to add it a couple of other places.

Warner

On Mon, Oct 9, 2017 at 5:56 PM, Steven Hartland <
steven.hartland at multiplay.co.uk> wrote:

> Not sure which of these sets of changes caused the issue but a clean build
> from scratch is currently failing here with:
>
> In file included from /usr/home/smh/freebsd/base/
> head/sys/boot/efi/boot1/ufs_module.c:41:
> In file included from /usr/home/smh/freebsd/base/
> head/sys/boot/efi/boot1/boot_module.h:35:
> /usr/home/smh/freebsd/base/head/sys/boot/efi/boot1/../include/efilib.h:33:10:
> fatal error: 'stand.h' file not found
> #include <stand.h>
>          ^~~~~~~~~
>
> Build was with -j24 in case it matters, going to try without -j but that
> will take many hours
>
>
> On 09/10/2017 23:11, Warner Losh wrote:
>
> Author: imp
> Date: Mon Oct  9 22:11:57 2017
> New Revision: 324449
> URL: https://svnweb.freebsd.org/changeset/base/324449
>
> Log:
>   Prefer ${LIBSTAND} to -lstand
>
>   Sponsored by: Netflix
>
> Modified:
>   head/sys/boot/arm/uboot/Makefile
>   head/sys/boot/efi/boot1/Makefile
>   head/sys/boot/sparc64/loader/Makefile
>
> Modified: head/sys/boot/arm/uboot/Makefile
> ==============================================================================
> --- head/sys/boot/arm/uboot/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
> +++ head/sys/boot/arm/uboot/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
> @@ -121,7 +121,7 @@ CFLAGS+=	-fPIC
>  NO_WERROR.clang=
>
>  DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
> -LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} -lstand
> +LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
>
>  OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
>
>
> Modified: head/sys/boot/efi/boot1/Makefile
> ==============================================================================
> --- head/sys/boot/efi/boot1/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
> +++ head/sys/boot/efi/boot1/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
> @@ -91,7 +91,7 @@ LIBEFI=		${.OBJDIR}/../libefi/libefi.a
>  # as well as required string and memory functions for all platforms.
>  #
>  DPADD+=		${LIBEFI} ${LIBSTAND}
> -LDADD+=		${LIBEFI} -lstand
> +LDADD+=		${LIBEFI} ${LIBSTAND}
>
>  DPADD+=		${LDSCRIPT}
>
>
> Modified: head/sys/boot/sparc64/loader/Makefile
> ==============================================================================
> --- head/sys/boot/sparc64/loader/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
> +++ head/sys/boot/sparc64/loader/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
> @@ -86,7 +86,7 @@ CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
>  CFLAGS+=	-I${SRCTOP}/sys
>
>  DPADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
> -LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand
> +LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
>
>  loader.help: help.common help.sparc64
>  	cat ${.ALLSRC} | \
>
>
>
>