From ff678e6c81624dcaea0f255cd3d2541ffb117273 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 27 Nov 2013 04:54:23 +0000
Subject: [PATCH] At great personal risk, change the default for LIB32 from yes
 to no.  As mentioned in UPDATING, you can even do it as an as-needed
 operation after doing a buildworld/installworld.  You can set WITH_LIB32=yes
 in make.conf or src.conf.

---
 UPDATING            | 7 +++++++
 share/mk/bsd.own.mk | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index b19034532b38..14532986ad14 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,13 @@ 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".)
 
+20131126:
+	WITH_LIB32 has been changed to WITHOUT_LIB32 by default.  You
+	can set WITH_LIB32=yes in make.conf or src.conf, or if you need
+	to do a quick 32 bit library build you can do a 'make build32'
+	and 'make install32' as a separate step AFTER doing a
+	buildworld/installworld.
+
 20131108:
 	The WITHOUT_ATF build knob has been removed and its functionality
 	has been subsumed into the more generic WITHOUT_TESTS.  If you were
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a71e442c3e5c..056ca86b8293 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -303,7 +303,6 @@ __DEFAULT_YES_OPTIONS = \
     LDNS \
     LDNS_UTILS \
     LEGACY_CONSOLE \
-    LIB32 \
     LIBPTHREAD \
     LIBTHR \
     LOCALES \
@@ -369,6 +368,7 @@ __DEFAULT_NO_OPTIONS = \
     GPL_DTC \
     HESIOD \
     INSTALL_AS_USER \
+    LIB32 \
     LLDB \
     NAND \
     OFED \