[Glibc-bsd-commits] r3822 - trunk/kfreebsd-10/debian/patches

[Robert Millan]

Author: rmh
Date: 2011-11-06 01:05:48 +0000 (Sun, 06 Nov 2011)
New Revision: 3822

Modified:
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
Log:
Extend to cover more instances of MK_INET_SUPPORT

Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2011-11-05 23:38:42 UTC (rev 3821)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2011-11-06 01:05:48 UTC (rev 3822)
@@ -18,7 +18,16 @@
  _if_carp=	if_carp
  .endif
  
-@@ -382,8 +381,7 @@
+@@ -374,7 +373,7 @@
+ _ipfilter=	ipfilter
+ .endif
+ 
+-.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
++.if 1
+ _ipfw=		ipfw
+ .endif
+ 
+@@ -382,11 +381,10 @@
  _netgraph=	netgraph
  .endif
  
@@ -27,7 +36,11 @@
 +.if 1
  _pf=		pf
  _pflog=		pflog
- .if ${MK_INET_SUPPORT} != "no"
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ _pfsync=	pfsync
+ .endif
+ .endif
 @@ -442,7 +440,7 @@
  _linsysfs=	linsysfs
  _linux=		linux
@@ -46,3 +59,69 @@
  _mlx4=		mlx4
  _mlx4ib=	mlx4ib
  _mlxen=		mlxen
+--- a/sys/modules/if_carp/Makefile
++++ b/sys/modules/if_carp/Makefile
+@@ -9,7 +9,7 @@
+ SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
+ 
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	@echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/ipfw/Makefile
++++ b/sys/modules/ipfw/Makefile
+@@ -22,7 +22,7 @@
+ #
+ 
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/netgraph/ipfw/Makefile
++++ b/sys/modules/netgraph/ipfw/Makefile
+@@ -7,7 +7,7 @@
+ 
+ .if !defined(KERNBUILDDIR)
+ 
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pf/Makefile
++++ b/sys/modules/pf/Makefile
+@@ -14,7 +14,7 @@
+ CFLAGS+= -I${.CURDIR}/../../contrib/pf
+ 
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pflog/Makefile
++++ b/sys/modules/pflog/Makefile
+@@ -14,7 +14,7 @@
+ .if defined(KERNBUILDDIR)
+ MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
+ .else
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pfsync/Makefile
++++ b/sys/modules/pfsync/Makefile
+@@ -14,7 +14,7 @@
+ .if defined(KERNBUILDDIR)
+ MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
+ .else
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ 	echo "#define INET 1" > ${.TARGET}
+ .endif