Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Jan 2023 22:10:46 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f05568d2cae6 - stable/13 - stand: For ZFS build, add new directory
Message-ID:  <202301242210.30OMAk6O080506@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=f05568d2cae620d15af9269ad0e2ac953c1c4449

commit f05568d2cae620d15af9269ad0e2ac953c1c4449
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-08 23:34:23 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-01-24 21:49:23 +0000

    stand: For ZFS build, add new directory
    
    OpenZFS is based on having a number of layers of include files that
    define things and include the next layer. Insert a later at the start
    for files in libsa/zfs/spl so we can override issues with upstream
    OpenZFS while we work to get the issues corrected upstream.
    
    Sponsored by:           Netflix
    Reviewed by:            kevans
    Differential Revision:  https://reviews.freebsd.org/D35750
    
    (cherry picked from commit 87d3aa53973fdfe1fa2ea64a8da9e29f4142d5af)
---
 stand/libsa/zfs/Makefile.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
index b503f6d20e86..f0d8129be9e1 100644
--- a/stand/libsa/zfs/Makefile.inc
+++ b/stand/libsa/zfs/Makefile.inc
@@ -13,7 +13,8 @@ CFLAGS+=	-I${LDRSRC}
 CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
 CFLAGS+=	-I${SYSDIR}/crypto/skein
 
-ZFS_EARLY=	-I${ZFSOSINC}					\
+ZFS_EARLY=	-I${ZFSSRC}/spl					\
+		-I${ZFSOSINC}					\
 		-I${ZFSOSINC}/spl				\
 		-I${ZFSOSINC}/zfs
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301242210.30OMAk6O080506>