diff options
| -rw-r--r-- | cddl/Makefile.inc | 1 | ||||
| -rw-r--r-- | lib/libbe/Makefile | 2 | ||||
| -rw-r--r-- | lib/libproc/Makefile | 2 | ||||
| -rw-r--r-- | lib/libprocstat/zfs.c | 2 | ||||
| -rw-r--r-- | lib/libprocstat/zfs/Makefile | 1 | ||||
| -rw-r--r-- | sbin/bectl/Makefile | 2 | ||||
| -rw-r--r-- | stand/defs.mk | 2 | ||||
| -rw-r--r-- | stand/libsa/Makefile | 3 |
8 files changed, 11 insertions, 4 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. diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index 87c032ae3a0c..099efed52d9f 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -61,7 +61,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS.be.c= -Wno-cast-qual CFLAGS.be_access.c= -Wno-cast-qual CFLAGS.be_error.c= -Wno-cast-qual diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 67c4e642ea00..ae00bdc4ba90 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -24,7 +24,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \ -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \ -I${SRCTOP}/sys/cddl/compat/opensolaris diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c index 422f923ac15c..665b1e5abe24 100644 --- a/lib/libprocstat/zfs.c +++ b/lib/libprocstat/zfs.c @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> /* __RENAME */ + #include <stdbool.h> #include <sys/param.h> diff --git a/lib/libprocstat/zfs/Makefile b/lib/libprocstat/zfs/Makefile index da689fdd3e81..3fa6f985c694 100644 --- a/lib/libprocstat/zfs/Makefile +++ b/lib/libprocstat/zfs/Makefile @@ -5,6 +5,7 @@ SRCS= zfs_defs.c OBJS= zfs_defs.o WARNS?= 1 +FORTIFY_SOURCE= 0 CFLAGS+= -DIN_BASE -D__KERNEL__ -D_KERNEL -I. -I${.CURDIR} CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index d640de33bf72..531f54cca18d 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -22,7 +22,7 @@ CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h HAS_TESTS= yes diff --git a/stand/defs.mk b/stand/defs.mk index 3624b9311161..452ba060c504 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -2,6 +2,8 @@ .if !defined(__BOOT_DEFS_MK__) __BOOT_DEFS_MK__=${MFILE} +FORTIFY_SOURCE= 0 + # We need to define all the MK_ options before including src.opts.mk # because it includes bsd.own.mk which needs the right MK_ values, # espeically MK_CTF. diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index bc85a3dcb0de..c5de2c9b8e13 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -195,7 +195,7 @@ MAN=libsa.3 # Create a subset of includes that are safe, as well as adjusting those that aren't # The lists may drive people nuts, but they are explicitly opt-in -FAKE_DIRS=xlocale arpa +FAKE_DIRS=xlocale arpa ssp SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h OTHER_INC=stdarg.h errno.h stdint.h @@ -210,6 +210,7 @@ beforedepend: ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ + ln -sf ${SRCTOP}/include/ssp/ssp.h ssp/ssp.h; \ for i in _time.h _strings.h _string.h; do \ [ -f xlocale/$$i ] || :> xlocale/$$i; \ done; \ |