The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8b4af206f67e93735a5b22921469a2bce63fb6ab
commit 8b4af206f67e93735a5b22921469a2bce63fb6ab
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-12-16 21:47:03 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-12-16 21:47:03 +0000
Sort libsodium sources by path in sys/modules/crypto/Makefile.
This matches the order used in sys/conf/files to make it easier to
keep these two files in sync.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D33484
---
sys/modules/crypto/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index f64ea1f6fc8b..4bea88b2af28 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -61,14 +61,14 @@ SRCS += xform_chacha20_poly1305.c
CFLAGS.xform_chacha20_poly1305.c+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT}
SRCS += xform_poly1305.c
CFLAGS.xform_poly1305.c += -I${LIBSODIUM_INC}
-I${LIBSODIUM_COMPAT}
-SRCS += stream_chacha20.c
-CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
-SRCS += chacha20_ref.c
-CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
SRCS += onetimeauth_poly1305.c
CFLAGS.onetimeauth_poly1305.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
SRCS += poly1305_donna.c
CFLAGS.poly1305_donna.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
+SRCS += stream_chacha20.c
+CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
+SRCS += chacha20_ref.c
+CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
SRCS += verify.c
CFLAGS.verify.c += -I${LIBSODIUM_INC}/sodium
-I${LIBSODIUM_COMPAT}
SRCS += randombytes.c
