Page MenuHomeFreeBSD
Files F157028861

D43237.id149023.diff
No OneTemporary
Actions

D43237.id149023.diff
View Options

diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -95,7 +95,6 @@
WARNS?= 2
SHLIB_MAJOR= 3
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile
--- a/cddl/lib/libicp_rescue/Makefile
+++ b/cddl/lib/libicp_rescue/Makefile
@@ -92,7 +92,6 @@
WARNS?= 2
SHLIB_MAJOR= 3
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -32,7 +32,6 @@
.endif
WARNS?= 2
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -10,7 +10,6 @@
SRCS= thread_pool.c
WARNS?= 2
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -9,7 +9,6 @@
SRCS = libzdb.c
WARNS?= 2
-CSTD= c99
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -85,7 +85,6 @@
WARNS?= 2
SHLIB_MAJOR= 4
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -14,7 +14,6 @@
zfs_ioctl_compat.c
WARNS?= 2
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -16,7 +16,6 @@
SRCS= $(USER_C)
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -283,8 +283,6 @@
LIBADD= md pthread z spl icp nvpair avl umem
-CSTD= c99
-
# Since there are many asserts in this library, it makes no sense to compile
# it without debugging.
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -23,7 +23,6 @@
WARNS?= 2
-CSTD= c99
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile
--- a/cddl/lib/pam_zfs_key/Makefile
+++ b/cddl/lib/pam_zfs_key/Makefile
@@ -11,7 +11,6 @@
SRCS= pam_zfs_key.c
WARNS?= 2
-CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -24,8 +24,6 @@
LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
-CSTD= c99
-
# Since there are many asserts in this program, it makes no sense to compile
# it without debugging.
CFLAGS+= -g -DDEBUG=1 -Wno-format -DZFS_DEBUG=1
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
--- a/cddl/usr.libexec/zpool_influxdb/Makefile
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -9,7 +9,6 @@
BINDIR?= /usr/libexec/zfs
WARNS?= 0
-CSTD= c99
CFLAGS+= \
-DIN_BASE \
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -10,7 +10,6 @@
SRCS= zdb.c zdb_il.c
WARNS?= 2
-CSTD= c99
CFLAGS+= \
-DIN_BASE \
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -5,7 +5,6 @@
MAN=
WARNS?= 0
-CSTD= c99
WARNS?= 2
CFLAGS+= -DIN_BASE
diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile
--- a/libexec/tftpd/tests/Makefile
+++ b/libexec/tftpd/tests/Makefile
@@ -4,6 +4,5 @@
TEST_METADATA.functional+= timeout=15
LIBADD= util
-CSTD= c11
.include <bsd.test.mk>
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -9,7 +9,6 @@
.if ${MACHINE_CPUARCH} == "arm"
WARNS?= 3
.endif
-CSTD= c11
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -10,8 +10,7 @@
.include <bsd.compiler.mk>
-# the default is gnu99 for now
-CSTD?= gnu99
+CSTD?= gnu17
.if ${CSTD} == "c89" || ${CSTD} == "c90"
CFLAGS+= -std=iso9899:1990
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -3,7 +3,6 @@
PACKAGE= runtime
PROG= sort
SRCS= bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c
-CSTD= c11
sort.1: sort.1.in
sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -15,7 +15,6 @@
MAN= makefs.8
NO_WCAST_ALIGN=
-CSTD= c11
.if ${MK_ZFS} != "no"
SRCS+= zfs.c

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 1:00 AM (2 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33281465
Default Alt Text
D43237.id149023.diff (5 KB)

Event Timeline