git: 165e199aebeb - stable/13 - stand: geli CFLAGS tightening

The branch stable/13 has been updated by imp:

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

commit 165e199aebeb4622ba0e7a84e376c7d9653748fd
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-08 16:02:17 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-01-24 21:49:22 +0000

    stand: geli CFLAGS tightening
    
    Only add -DWEAK_REFS to sha256.c and sha512.c instead of
    everything. Remove redundant include that's not needed.
    Minor formatting tweak.
    
    Sponsored by:           Netflix
    
    (cherry picked from commit eaf7aabddcde9bf9eecffb41ba6569de0f5fa645)
    
    stand geli: Restore include path to LDRSRC.
    
    Various GELI sources need bootstrap.h and disk.h. In theory they
    shouldn't need anything outside of libsa, but disk.h and bootstrap.h are
    currently required.
    
    This fixes the build with MK_LOADER_ZFS=no.
    
    Obtained from: CheriBSD
    Fixes: eaf7aabddcde stand: geli CFLAGS tightening
    Sponsored by: DARPA
    Reviewed by: imp
    Differential Revision: https://reviews.freebsd.org/D35861
    
    (cherry picked from commit bb7ddd077c2528b37399304d7a9bf70b25c42b47)
---
 stand/libsa/geli/Makefile.inc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc
index 734bcf6be5e6..88a3bad82a0e 100644
--- a/stand/libsa/geli/Makefile.inc
+++ b/stand/libsa/geli/Makefile.inc
@@ -3,14 +3,13 @@
 
 .PATH: ${SASRC}/geli
 
-CFLAGS+=	-I${LDRSRC}
-
 # Our password input method
-SRCS+=  pwgets.c
+SRCS+=		pwgets.c
 
 # sha256 and sha512 from sys/crypto
 .PATH: ${SYSDIR}/crypto/sha2
-CFLAGS+=	-DWEAK_REFS
+CFLAGS.sha256.c+=	-DWEAK_REFS
+CFLAGS.sha512.c+=	-DWEAK_REFS
 SRCS+=		sha256c.c sha512c.c
 
 # md5 from libmd
@@ -27,11 +26,11 @@ SRCS+=		${i}
 
 # local GELI Implementation
 .PATH: ${SYSDIR}/geom/eli
+.for i in geliboot.c geliboot_crypto.c gelidev.c geli_metadata.c
+CFLAGS.${i}+=	-I${LDRSRC}
+SRCS+=		${i}
+.endfor
 SRCS+=		\
-		geliboot.c \
-		geliboot_crypto.c \
-		gelidev.c \
-		geli_metadata.c \
 		g_eli_hmac.c \
 		g_eli_key.c \
 		g_eli_key_cache.c \