From owner-svn-src-head@freebsd.org Tue Oct 10 00:01:46 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 43225E3F9B1 for ; Tue, 10 Oct 2017 00:01:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x241.google.com (mail-io0-x241.google.com [IPv6:2607:f8b0:4001:c06::241]) (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 04BB21450 for ; Tue, 10 Oct 2017 00:01:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x241.google.com with SMTP id m16so8297370iod.5 for ; Mon, 09 Oct 2017 17:01:45 -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=3LR223Te/Io7e7r47PuEY1SpN2gY+9GszCzIChSgonI=; b=m99EuQYVStiWw8dqBHHCGS8L8j+fJJsT2R6P9Gl6F5to/h1J2IHnThpYQfp+rmEaZG v4bIFoUiFqdIcljXrng5pdAR7tFUuec9rEyMFW+VVenS+iI3IJ2mfV/WwN1XuwyHi7OW fD4EIKFOSsj9lioXMCfUesvrFocvWO5N5tP1y8L5+HwrNP83Hl9xb0liSmtGIaHu1M41 5FXizJ7g/hA5Jfi4/tGVTREBB8ykkIBtotgg+HGQYavf5AYt2fEn8s9uPQ8pWV117JSN y4cc3PxVLVk+6w2m1Kd8eAceW8tBS19viuafEet2SeRHpjl3RRhleUPNt83r1m6LHpfa kFFA== 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=3LR223Te/Io7e7r47PuEY1SpN2gY+9GszCzIChSgonI=; b=dwgnd+JOgP0Y+leefTt6ETCGsPBifJ9Cnh6dhq4z/VMfMIbCsy6l5au6tOdKEwioVr HqL1BTDh6SpU2a9TX4dSA10gbOWlBNs65u9vJPO7AnUMCQyGxQ8Uid2l4l431dMfullr 9zjd1OlOyzyaCGNlYQram+903i00/4jozl46gQtRoDkGgXqPDlUQn0FaESDMPelqndVp vwnlZB89vNP0dqzNw2EkAK2a63yBImXBAstl6Ia+O8UPod2oP4d2ETc2m8C3PP9Vta8H 4OMMgMnq05uPEMSH5DVwrdtIrmzDSszxKOXB3fWUIYW/SRTQPmlUhDqir9VtpETAs5b6 Dkdw== X-Gm-Message-State: AMCzsaVtrRKI8RhqIlQZKqmRyvTkcQ3Z9XhgLN57dctZA3iWmAjSSnW7 PXONTTy0cKZz5bdGEe1XD0sTZpgVexlQxOkkAN490A== X-Google-Smtp-Source: AOwi7QAQQ5wLQ87pVnQGKe+BSdplbJ9T1kNEuy16FPaCjdW1ULXJ24gqBEYUz3gK9y5Ptz3dn2O0ryD7CaMQAvj5GY4= X-Received: by 10.107.68.6 with SMTP id r6mr16407396ioa.282.1507593705280; Mon, 09 Oct 2017 17:01:45 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.94.130 with HTTP; Mon, 9 Oct 2017 17:01:44 -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:01:44 -0600 X-Google-Sender-Auth: K-A_U0F4G0vfvogxaol_0pssNaE 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:01:46 -0000 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} | \ >> >> >> >> >