Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Disable -Wshadow for libsodium.
details: https://anonhg.NetBSD.org/src/rev/e6cceb002b3a
branches: trunk
changeset: 1013119:e6cceb002b3a
user: riastradh <riastradh%NetBSD.org@localhost>
date: Fri Aug 21 06:27:41 2020 +0000
description:
Disable -Wshadow for libsodium.
Evidently ed25519_ref10.c has a global and a local both named `d'.
diffstat:
sys/external/isc/libsodium/conf/files.libsodium | 4 ++--
sys/rump/kern/lib/libcrypto/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (34 lines):
diff -r 56e6b8c297c1 -r e6cceb002b3a sys/external/isc/libsodium/conf/files.libsodium
--- a/sys/external/isc/libsodium/conf/files.libsodium Fri Aug 21 05:28:41 2020 +0000
+++ b/sys/external/isc/libsodium/conf/files.libsodium Fri Aug 21 06:27:41 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: files.libsodium,v 1.1 2020/08/20 21:20:16 riastradh Exp $
+# $NetBSD: files.libsodium,v 1.2 2020/08/21 06:27:41 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-unused-function -Wno-unused-variable -DHAVE_TI_MODE"
+makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-shadow -Wno-unused-function -Wno-unused-variable -DHAVE_TI_MODE"
makeoptions libsodium "CPPFLAGS.x25519_ref10.c"+="${SODIUM_CPPFLAGS}"
makeoptions libsodium "CPPFLAGS.scalarmult_curve25519.c"+="${SODIUM_CPPFLAGS}"
diff -r 56e6b8c297c1 -r e6cceb002b3a sys/rump/kern/lib/libcrypto/Makefile
--- a/sys/rump/kern/lib/libcrypto/Makefile Fri Aug 21 05:28:41 2020 +0000
+++ b/sys/rump/kern/lib/libcrypto/Makefile Fri Aug 21 06:27:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/08/20 21:33:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2020/08/21 06:27:41 riastradh Exp $
#
SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
@@ -64,7 +64,7 @@
SODIUM_CPPFLAGS=
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/include
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium
-SODIUM_CPPFLAGS+= -Wno-unused-function -Wno-unused-variable -DHAVE_TI_MODE
+SODIUM_CPPFLAGS+= -Wno-shadow -Wno-unused-function -Wno-unused-variable -DHAVE_TI_MODE
CPPFLAGS.x25519_ref10.c+= ${SODIUM_CPPFLAGS}
CPPFLAGS.scalarmult_curve25519.c+= ${SODIUM_CPPFLAGS}
Home |
Main Index |
Thread Index |
Old Index