Module Name: src
Committed By: riastradh
Date: Fri Aug 21 06:30:46 UTC 2020
Modified Files:
src/sys/external/isc/libsodium/conf: files.libsodium
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Split flags onto separate lines, sorted, to make diffs easier.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/isc/libsodium/conf/files.libsodium
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/kern/lib/libcrypto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/libsodium/conf/files.libsodium
diff -u src/sys/external/isc/libsodium/conf/files.libsodium:1.2 src/sys/external/isc/libsodium/conf/files.libsodium:1.3
--- src/sys/external/isc/libsodium/conf/files.libsodium:1.2 Fri Aug 21 06:27:41 2020
+++ src/sys/external/isc/libsodium/conf/files.libsodium Fri Aug 21 06:30:46 2020
@@ -1,10 +1,15 @@
-# $NetBSD: files.libsodium,v 1.2 2020/08/21 06:27:41 riastradh Exp $
+# $NetBSD: files.libsodium,v 1.3 2020/08/21 06:30:46 riastradh Exp $
define libsodium
makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/include"
makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/dist/src/libsodium/include/sodium"
-makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-shadow -Wno-unused-function -Wno-unused-variable -DHAVE_TI_MODE"
+
+makeoptions libsodium SODIUM_CPPFLAGS+="-DHAVE_TI_MODE"
+
+makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-shadow"
+makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-unused-function"
+makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-unused-variable"
makeoptions libsodium "CPPFLAGS.x25519_ref10.c"+="${SODIUM_CPPFLAGS}"
makeoptions libsodium "CPPFLAGS.scalarmult_curve25519.c"+="${SODIUM_CPPFLAGS}"
Index: src/sys/rump/kern/lib/libcrypto/Makefile
diff -u src/sys/rump/kern/lib/libcrypto/Makefile:1.17 src/sys/rump/kern/lib/libcrypto/Makefile:1.18
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.17 Fri Aug 21 06:27:41 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Fri Aug 21 06:30:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/08/21 06:27:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2020/08/21 06:30:46 riastradh Exp $
#
SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
@@ -64,7 +64,12 @@ SRCS+= blake2s.c
SODIUM_CPPFLAGS=
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/include
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium
-SODIUM_CPPFLAGS+= -Wno-shadow -Wno-unused-function -Wno-unused-variable -DHAVE_TI_MODE
+
+SODIUM_CPPFLAGS+= -DHAVE_TI_MODE
+
+SODIUM_CPPFLAGS+= -Wno-shadow
+SODIUM_CPPFLAGS+= -Wno-unused-function
+SODIUM_CPPFLAGS+= -Wno-unused-variable
CPPFLAGS.x25519_ref10.c+= ${SODIUM_CPPFLAGS}
CPPFLAGS.scalarmult_curve25519.c+= ${SODIUM_CPPFLAGS}
