Author: des
Date: Thu Jan 10 22:44:19 2013
New Revision: 245269
URL: http://svnweb.freebsd.org/changeset/base/245269
Log:
Remove all support for legacy NOFOO and NO_FOO build options.
Deleted:
head/share/mk/bsd.compat.mk
Modified:
head/share/mk/Makefile
head/share/mk/bsd.init.mk
head/share/mk/bsd.own.mk
head/share/mk/sys.mk
Modified: head/share/mk/Makefile
==============================================================================
--- head/share/mk/Makefile Thu Jan 10 22:36:30 2013 (r245268)
+++ head/share/mk/Makefile Thu Jan 10 22:44:19 2013 (r245269)
@@ -6,7 +6,6 @@
FILES= \
bsd.README \
bsd.arch.inc.mk \
- bsd.compat.mk \
bsd.compiler.mk \
bsd.cpu.mk \
bsd.crunchgen.mk \
Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk Thu Jan 10 22:36:30 2013 (r245268)
+++ head/share/mk/bsd.init.mk Thu Jan 10 22:44:19 2013 (r245269)
@@ -9,7 +9,6 @@ __<bsd.init.mk>__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
-.include <bsd.compat.mk>
.include <bsd.own.mk>
.MAIN: all
.endif # !target(__<bsd.init.mk>__)
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Thu Jan 10 22:36:30 2013 (r245268)
+++ head/share/mk/bsd.own.mk Thu Jan 10 22:44:19 2013 (r245269)
@@ -216,80 +216,6 @@ WITHOUT_${var}=
.endfor
#
-# Compat NO_* options (same as above, except their use is deprecated).
-#
-.if !defined(BURN_BRIDGES)
-.for var in \
- ACPI \
- ATM \
- AUDIT \
- AUTHPF \
- BIND \
- BIND_DNSSEC \
- BIND_ETC \
- BIND_LIBS_LWRES \
- BIND_MTREE \
- BIND_NAMED \
- BIND_UTILS \
- BLUETOOTH \
- BOOT \
- CALENDAR \
- CPP \
- CRYPT \
- CVS \
- CXX \
- DICT \
- DYNAMICROOT \
- EXAMPLES \
- FORTH \
- FP_LIBC \
- GAMES \
- GCOV \
- GDB \
- GNU \
- GPIB \
- GROFF \
- HTML \
- INET6 \
- INFO \
- IPFILTER \
- IPX \
- KDUMP \
- KERBEROS \
- LIB32 \
- LIBPTHREAD \
- LIBTHR \
- LOCALES \
- LPR \
- MAILWRAPPER \
- NETCAT \
- NIS \
- NLS \
- NLS_CATALOGS \
- NS_CACHING \
- OPENSSH \
- OPENSSL \
- PAM \
- PF \
- RCMDS \
- RCS \
- RESCUE \
- SENDMAIL \
- SETUID_LOGIN \
- SHAREDOCS \
- SYSCONS \
- TCSH \
- TOOLCHAIN \
- USB \
- WPA_SUPPLICANT_EAPOL
-.if defined(NO_${var})
-#.warning NO_${var} is deprecated in favour of WITHOUT_${var}=
-WITHOUT_${var}=
-.endif
-.endfor
-.endif # !defined(BURN_BRIDGES)
-
-#
# Older-style variables that enabled behaviour when set.
#
.if defined(YES_HESIOD)
Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk Thu Jan 10 22:36:30 2013 (r245268)
+++ head/share/mk/sys.mk Thu Jan 10 22:44:19 2013 (r245269)
@@ -346,5 +346,4 @@ OBJFORMAT?= elf
.endif
-.include <bsd.compat.mk>
.include <bsd.cpu.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
