[src/trunk]: src/sys Split flags onto separate lines, sorted, to make diffs e...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3de679f16534
branches:  trunk
changeset: 975086:3de679f16534
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Aug 21 06:30:46 2020 +0000

description:
Split flags onto separate lines, sorted, to make diffs easier.

diffstat:

 sys/external/isc/libsodium/conf/files.libsodium |  9 +++++++--
 sys/rump/kern/lib/libcrypto/Makefile            |  9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 9f9aa0038aa3 -r 3de679f16534 sys/external/isc/libsodium/conf/files.libsodium
--- a/sys/external/isc/libsodium/conf/files.libsodium   Fri Aug 21 06:28:38 2020 +0000
+++ b/sys/external/isc/libsodium/conf/files.libsodium   Fri Aug 21 06:30:46 2020 +0000
@@ -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}"
diff -r 9f9aa0038aa3 -r 3de679f16534 sys/rump/kern/lib/libcrypto/Makefile
--- a/sys/rump/kern/lib/libcrypto/Makefile      Fri Aug 21 06:28:38 2020 +0000
+++ b/sys/rump/kern/lib/libcrypto/Makefile      Fri Aug 21 06:30:46 2020 +0000
@@ -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 @@
 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}