The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=eb2d9adb246a7ff184ddd0d3fccfeccbf067985b
commit eb2d9adb246a7ff184ddd0d3fccfeccbf067985b
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-12-16 21:46:48 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-12-16 21:46:48 +0000
Sort libsodium entries by path in sys/conf/files.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D33483
---
sys/conf/files | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index fbb888db2757..a3f7c0928214 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4939,34 +4939,34 @@ opencrypto/xform_chacha20_poly1305.c optional crypto
\
compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
opencrypto/xform_poly1305.c optional crypto \
compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c
\
+contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
\
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c
\
+contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
\
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c \
+contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-crypto/libsodium/randombytes.c optional crypto \
- compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
-crypto/libsodium/utils.c optional crypto \
- compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \
+contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c
\
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \
+contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c
\
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \
+contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
\
+contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
\
+contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c \
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
+crypto/libsodium/randombytes.c optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
+crypto/libsodium/utils.c optional crypto \
+ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
rpc/auth_none.c optional krpc | nfslockd | nfscl | nfsd
rpc/auth_unix.c optional krpc | nfslockd | nfscl | nfsd
