From owner-svn-src-head@freebsd.org Tue Oct 10 00:00:05 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8AE2E3F798 for ; Tue, 10 Oct 2017 00:00:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x235.google.com (mail-io0-x235.google.com [IPv6:2607:f8b0:4001:c06::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6746EFA for ; Tue, 10 Oct 2017 00:00:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x235.google.com with SMTP id z187so22523518ioz.12 for ; Mon, 09 Oct 2017 17:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=PPIKE1TxdyYeVNgxrqBnX+xK7h4I+d19dRUznmMCcvg=; b=YU+m3BiCNAE7+6U/qGwq5fb76PS5Bwro77cCwYkX8YDpiCFRyGNVk67wQsBnwIgnwA +ibvHNOD4Piq8MKvmM0fWK+WveS9J5lqxayDmIVh6oviSTJUDv4+A0ba7iM3exTe8Stm cxwkDuiXx4iXo9FjgXeChLCADFOUDy2tVHbId7/HXXWBXY7alSPHodxoLg6pjNTivM7o xJnQNqPsznUHnqAQFlC7tn1XDXLvs/oaRerRPJzPEE38JMXBo/UKoPjKWbHj0ZIhfQft Orj4WEpB8PIEcEGpAGB1862S1k17JcjelXyf/4w0B5EAHfGVdioTgj3aBYMs9wh4AhsQ 3n2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=PPIKE1TxdyYeVNgxrqBnX+xK7h4I+d19dRUznmMCcvg=; b=np361lcrwAYId3rSq/XFiTYcSy7Uo8KXfUyMR5T3OL7+ZceKrOcP5Wwq4yrO5FQINu wyn1OMbsRhMbPA5DZx8P8deAE8GS4MHf33EzCYLPyTOd4fDqQBxGLC3Ojid/Eb1yYDf2 Kn6tF44cYODjE/HoSuBgxWbxjl9lGJdf6fktryJOyPRrWiFXZB8FnDjCYzubR6jj/Ith vWCDwEJ0re6wV8uU/2yDU72GAG+RMUvMThYU3hNj0cHSiRl21YWeGSAQ+KQPuyETjhmi 6WTfO0Qz3B6JiN0LQ1Iky6DneWqT4wdII+asi6WGwMYxRxBk9b9sdToR/wG3Yc0XgQTT M7fQ== X-Gm-Message-State: AMCzsaX3coEh9KxWFGfGGBiT3/yVSBqoSFbAKmpdDjpPrdnYBoeZreqN 2MarsN92V5DoympIKuzZCElcJQjyhlorKs7VD+Ls+g== X-Google-Smtp-Source: AOwi7QBiv4gVKIcgUmLPX4r70AFJh2UhGCgZhxsyzD43UPHeQ7iEpVarXl7F4ttTJdmbzU86ad7ttlPPwvmB1yhKEKo= X-Received: by 10.107.133.85 with SMTP id h82mr14342327iod.208.1507593604981; Mon, 09 Oct 2017 17:00:04 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.94.130 with HTTP; Mon, 9 Oct 2017 17:00:04 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:8936:338a:89de:d5ea] In-Reply-To: References: <201710092211.v99MBwCq010906@repo.freebsd.org> From: Warner Losh Date: Mon, 9 Oct 2017 18:00:04 -0600 X-Google-Sender-Auth: pQkSVC_67vTljgjQ5ovRalmPG8M Message-ID: Subject: Re: svn commit: r324449 - in head/sys/boot: arm/uboot efi/boot1 sparc64/loader To: Steven Hartland Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Oct 2017 00:00:06 -0000 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@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 > ^~~~~~~~~ > > 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} | \ > > > >