From a46954e28e8eb9a3929a25d3164a814d61e1dd61 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 6 May 2014 04:22:29 +0000 Subject: [PATCH] Document src.opts.mk changes and the decoupling of /etc/src.conf from anything but the source tree. --- Makefile.inc1 | 2 +- UPDATING | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 870ed7c309ce..549aa2fff001 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -45,7 +45,7 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif -.include +.include "share/mk/src.opts.mk" .include .include diff --git a/UPDATING b/UPDATING index 35ec68beb49a..370dd00ada28 100644 --- a/UPDATING +++ b/UPDATING @@ -12,9 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping -from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of -head, and then rebuild without this option. The bootstrap process from -older version of current is a bit fragile. +from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to +the tip of head, and then rebuild without this option. The bootstrap process from +older version of current accorss the gcc/clang cutover is a bit fragile. NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: FreeBSD 11.x has many debugging features turned on, in both the kernel @@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140505: + /etc/src.conf now affects only builds of the FreeBSD src tree. In the + past, it affected all builds that used the bsd.*.mk files. The old + behavior was a bug, but people may have relied upon it. To get this + behavior back, you can .include /etc/src.conf from /etc/make.conf + (which is still global and isn't changed). This also changes the + behavior of incremental builds inside the tree of individual + directories. Set MAKESYSPATH to ".../share/mk" to do that. + Although this has survived make universe and some upgrade scenarios, + other upgrade scenarios may have broken. + 20140430: The lindev device has been removed since /dev/full has been made a standard device. __FreeBSD_version has been bumped.