From owner-svn-src-head@freebsd.org Tue Oct 10 00:38:09 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 A4F4AE405AF for ; Tue, 10 Oct 2017 00:38:09 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com [IPv6:2a00:1450:400c:c09::22d]) (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 30C3A27AC for ; Tue, 10 Oct 2017 00:38:09 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wm0-x22d.google.com with SMTP id i124so738815wmf.3 for ; Mon, 09 Oct 2017 17:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=/z7of2WcE8sqg+vOorLBB3B/ZJkudsfQfdEWQJc7OUE=; b=NL9Z8hWWNcPf2m06OBblwdaXFZ8fNw5mLjfznsQcqKNrhECGET90rYigUZviGJXDo+ L1E5QaCoHDpqe+uOUd5gmHzNBfDrWKYTRBR+Rvvs9pzvisIcJf6me3f48lGB6sPywn2G styBqYOo5ZpeBE92n3XPAjKrMpD3J0RB/XBCjgyiCE9qjEsqZ599ZEzGXfQ8rCgNN99N D04D+oCmgWga/wZwR1ReVgcLTrRTbeJkQSsm/c8FQPKWJGY9gHAJ9KUZZ8nBe+HXKOrE BBHPxdEf9OS7LOoiEUKXVoghYHH5zk+/ugNBzcE1CzI2IPO1wpg5+tuLFf3CXfLHYZnn /PWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=/z7of2WcE8sqg+vOorLBB3B/ZJkudsfQfdEWQJc7OUE=; b=gqFC+1sPRRGZjpj6Jz5M/OLC4obur25+TB4GpMnxgnb2O/rtRsybI6/ScOjgyMC+eW qcqzwxQVC96JCLlbejZ3ozPnK2UJDWJ4s3V1bGJJYXJFpwQnv49GBcsgWUM4dsWkPqGm es/nDn6ZBhX2QRteALSE0LhXO4WApK2PVfkLCkb5s6294QQn52fu8sy47JbuidPrSCYc T78S675/iU5e9q6VTBP6H4zlGbi0+VkUa6vfvhJiS5oLc7Ijy2axnkfz4jeUmnDC5qCI 2X4tXKbCCdTUcx0f7XXVgMDd/vcNPFluItyi2FDc7arxV+LB5a0SrvRU6yp/Isw9F0Fx HslQ== X-Gm-Message-State: AMCzsaWzIRcLyxD2HV28nSPY/wkxag/4ePTdaxzYuv/dKbcOr/3DHM0g 2JTfnsCI7lzrLWTeeMkXEcbBri0fjXs= X-Google-Smtp-Source: AOwi7QCPqwSiJYtTzWR5sQeaeCyRoyJI9ZGuzsMMqf/vDhP31op2lWcP7kkmAVdH4PzpNjhN/RpNpg== X-Received: by 10.28.173.1 with SMTP id w1mr9045157wme.3.1507595887238; Mon, 09 Oct 2017 17:38:07 -0700 (PDT) Received: from [10.10.1.111] ([185.97.61.1]) by smtp.gmail.com with ESMTPSA id y84sm3476363wmg.43.2017.10.09.17.38.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 17:38:05 -0700 (PDT) Subject: Re: svn commit: r324449 - in head/sys/boot: arm/uboot efi/boot1 sparc64/loader To: Warner Losh Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" References: <201710092211.v99MBwCq010906@repo.freebsd.org> From: Steven Hartland Message-ID: Date: Tue, 10 Oct 2017 01:38:06 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 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:38:09 -0000 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 > > 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} | \ >> > > >