svn commit: r361632 - in head/sys: conf modules/ipsec modules/tcp/tcpmd5

[John Baldwin]

Author: jhb
Date: Fri May 29 19:21:35 2020
New Revision: 361632
URL: https://svnweb.freebsd.org/changeset/base/361632

Log:
  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

Modified:
  head/sys/conf/config.mk
  head/sys/modules/ipsec/Makefile
  head/sys/modules/tcp/tcpmd5/Makefile

Modified: head/sys/conf/config.mk
==============================================================================
--- head/sys/conf/config.mk	Fri May 29 18:05:40 2020	(r361631)
+++ head/sys/conf/config.mk	Fri May 29 19:21:35 2020	(r361632)
@@ -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}

Modified: head/sys/modules/ipsec/Makefile
==============================================================================
--- head/sys/modules/ipsec/Makefile	Fri May 29 18:05:40 2020	(r361631)
+++ head/sys/modules/ipsec/Makefile	Fri May 29 19:21:35 2020	(r361632)
@@ -8,7 +8,4 @@ SRCS=	if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ip
 	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 <bsd.kmod.mk>

Modified: head/sys/modules/tcp/tcpmd5/Makefile
==============================================================================
--- head/sys/modules/tcp/tcpmd5/Makefile	Fri May 29 18:05:40 2020	(r361631)
+++ head/sys/modules/tcp/tcpmd5/Makefile	Fri May 29 19:21:35 2020	(r361632)
@@ -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 <bsd.kmod.mk>