From owner-svn-src-all@freebsd.org Tue Oct 10 01:33:41 2017 Return-Path: Delivered-To: svn-src-all@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 19782E42505 for ; Tue, 10 Oct 2017 01:33:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (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 CC93B63EAE for ; Tue, 10 Oct 2017 01:33:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22e.google.com with SMTP id m16so14217421iod.1 for ; Mon, 09 Oct 2017 18:33:40 -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=qll4/7QvzgGkwOp5yL2bkM+KvBOUhmoS39dKPfzvTSU=; b=X359/znqcdjlXcXriPsnrawZJqWuxNhXobYF27B4+YbTfU0qeUJL1nOmUPcZUmhMXB TjaGkTb2Sso4m1OyGeW7aUaN8MlV6SdEu2zgM+2RL8/R7sKgi4SwnsnwMEriBGGE7iud aTJ4o87oAj1DW4fhjRsdAh8LkTGqoXw92Bn1E/6va8+l7JrvPmqcu3wcqa9UyJB9j/tv mE35AOBatYWNWZgGDfoUqcupQjQv4Ulgg5ZKr7Y8lD2QkS5eza9zijCBGgD0amoajore xshYRfcsw7PDcdsDci4XNRaEALFcytDr7qXjmot2p5YVxhUIBx0QKyJIHTHunrlm2tPP H8kw== 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=qll4/7QvzgGkwOp5yL2bkM+KvBOUhmoS39dKPfzvTSU=; b=UkVds/EfKv13bBKorpT5BkytjTmY0R5P8wV42qPJkC0dc+KUs5jZxjq4tQOTHMCwkl r8F3WUH+FvbPp/+100wpzFNNld9DTUhDsklXDgAFyj7URZyAM6fiIt6QxzUjNBwqP02k 0TayKqqdhghDWtxYeSh9uOoY09+TnaN1NXy8G/OZkXhh0FIuqHUsusmdhtjDSi/0UjH8 IzNMm4k6beX1VhVdN/ZJsZ11MsD1pf6BVZPguzpohcQhkb5yPt53MlVyQdTKxCMkH35V Wn1hxTr62UYSeBowL1aUBeSMAFvVN0rBj+TA8WyxqiwvAeNTrBHZW1Q5Nh8xyfQ75R1M PJjQ== X-Gm-Message-State: AMCzsaXuSPHpXXc1EMfEfAWtv3tdhI8txV5EPJmfwmWszhNXW5X42Av2 Khb9eSPdy292IuwmxBV6ABGvJD6aoluoDF7/Vr/jhA== X-Google-Smtp-Source: AOwi7QC6/OAQKad4cMsSpA3zHlavgsIySoDnGwRdpvlxnr0UbTKrYGm6GL/Yqan+pdPP4xY56xN8IGT2TA3foQcgZfQ= X-Received: by 10.107.185.6 with SMTP id j6mr11078796iof.221.1507599220143; Mon, 09 Oct 2017 18:33:40 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.94.130 with HTTP; Mon, 9 Oct 2017 18:33:39 -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 19:33:39 -0600 X-Google-Sender-Auth: 1PadNpsu93vd9O5fRbQB1crDq9w 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Oct 2017 01:33:41 -0000 Yea, that's my bad. I didn't do a completely clean build with stand.h gone, so I didn't catch it before the commit. I've just pushed in a fixup so that we always include the path to stand.h in the include path, since almost everybody needs it, and it is harmless to the others to include. Sorry for the bumps... Warner On Mon, Oct 9, 2017 at 6:38 PM, Steven Hartland < steven.hartland@multiplay.co.uk> wrote: > Yer even no -j fails :( > > > On 10/10/2017 01:01, Warner Losh wrote: > > Oh, killed /usr/include/stand.h and found it. I'll post a fix when I get > back. > > On Mon, Oct 9, 2017 at 6:00 PM, Warner Losh wrote: > >> 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/hea >>> d/sys/boot/efi/boot1/ufs_module.c:41: >>> In file included from /usr/home/smh/freebsd/base/hea >>> d/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} | \ >>> >>> >>> >>> >> > >