aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2024-07-13 05:16:09 +0000
committerKyle Evans <kevans@FreeBSD.org>2024-07-13 05:16:23 +0000
commit41c233dec6c15c543d3042c06833c1623456743c (patch)
tree77fd232aca2b0fcbfa6eb5ca88961ffe8cce5043 /cddl
parent9b505845a3aefd2ffaef77764aeca092653f0772 (diff)
downloadsrc-41c233dec6c15c543d3042c06833c1623456743c.tar.gz
src-41c233dec6c15c543d3042c06833c1623456743c.zip
Prepare some build fixes in advance of more _FORTIFY_SOURCE
ZFS' libspl needs to be made aware that we have strlcat(3) and strlcpy(3) to avoid some more complicated declaration duplication, so go ahead and define these HAVE_ macros now. libprocstat has to define `_KERNEL` and include kernel headers in order to get what it wants, but this results in sys/cdefs.h being included too late and we pick up the build breaking version of the __RENAME definition. Just explicitly include sys/cdefs.h earlier rather than disabling _FORTIFY_SOURCE. The zfs/ subdir only builds an object that holds some structures and sizes, so just disable _FORTIFY_SOURCE there entirely rather than trying to move #define _KERNEL into the file.. While we're here, make sure that we disable _FORTIFY_SOURCE in the bootloader because we don't have the symbol renaming support today to do it as cleanly as we'd like. ssp/ssp.h needs to be pulled into the libsa environment so that other bits can understand that ssp is disabled in the consistent __SSP_FORTIFY_LEVEL way that we try to do. Reviewed by: allanjude (previous version), markj Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D45676
Diffstat (limited to 'cddl')
-rw-r--r--cddl/Makefile.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index b306a28b5c84..f07baf295b89 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -5,6 +5,7 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
+CFLAGS+= -DHAVE_STRLCAT -DHAVE_STRLCPY
# Do not lint the CDDL stuff. It is all externally maintained and
# lint output is wasteful noise here.