From 4bcbd26ff8ba994b042e655dd2c865f3722c0899 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 29 May 2020 19:21:35 +0000 Subject: [PATCH] Honor opt_ipsec.h from kernel builds. To make this simpler, set the default contents of opt_ipsec.h for standalone modules in sys/conf/config.mk. Reviewed by: imp MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25046 --- sys/conf/config.mk | 2 ++ sys/modules/ipsec/Makefile | 3 --- sys/modules/tcp/tcpmd5/Makefile | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 50188eee923..563e9d0a362 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -30,6 +30,8 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +opt_ipsec.h: + @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} .if ${MK_RATELIMIT} != "no" opt_ratelimit.h: @echo "#define RATELIMIT 1" > ${.TARGET} diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile index 01b92c57643..46472f910d1 100644 --- a/sys/modules/ipsec/Makefile +++ b/sys/modules/ipsec/Makefile @@ -8,7 +8,4 @@ SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \ opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h SRCS.INET= udpencap.c -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include diff --git a/sys/modules/tcp/tcpmd5/Makefile b/sys/modules/tcp/tcpmd5/Makefile index a92e7874794..e2d96195d80 100644 --- a/sys/modules/tcp/tcpmd5/Makefile +++ b/sys/modules/tcp/tcpmd5/Makefile @@ -5,7 +5,4 @@ KMOD= tcpmd5 SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include