Up the minimum system to build FreeBSD current to 8.0-RELEASE. The

issues with vendors that needed 7.x support have been resolved. Many
vendors are still using 8.x build platforms, however, so bumping this
up to 9.0 will have to wait until that is resolved. Actual support for
building from 8.x still relies on those vendors fixing bugs that are
present as most developers have moved onto 9.x or newer platforms.

Reviewed by: marcel@

2 files changed, 3 insertions, 25 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 39b70ea..592cdda 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1159,8 +1159,8 @@ update:
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
+.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1188,14 +1188,6 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
-.if ${BOOTSTRAPPING} < 800022
-_ar=		usr.bin/ar
-.endif
-
-.if ${BOOTSTRAPPING} < 800013
-_mklocale=	usr.bin/mklocale
-.endif
-
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
@@ -1279,13 +1271,11 @@ bootstrap-tools: .MAKE
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
-    ${_ar} \
     ${_dtc} \
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
-    ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
@@ -1362,7 +1352,7 @@ kernel-tools: .MAKE
 .if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
 TARGET_ARCH=	${XDEV_ARCH}
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
diff --git a/tools/build/Makefile b/tools/build/Makefile
index b9b548e..8078dca 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -9,18 +9,6 @@ INCS=
 
 BOOTSTRAPPING?=	0
 
-_WITH_GETLINE!=	grep -c _WITH_GETLINE /usr/include/stdio.h || true
-.if ${_WITH_GETLINE} == 0
-.PATH: ${.CURDIR}/../../contrib/file ${.CURDIR}/../../lib/libmagic
-SRCS=		getline.c config.h
-CFLAGS+=	-DHAVE_CONFIG_H -I.
-CLEANFILES+=	config.h
-
-${SRCS:N*.h:R:S/$/.o/}: config.h
-config.h: ${.CURDIR}/../../lib/libmagic/config.h
-	grep -v HAVE_GETLINE ${.ALLSRC} > ${.TARGET}
-.endif
-
 _WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/pwd.h || true
 .if ${_WITH_PWCACHEDB} == 0
 .PATH: ${.CURDIR}/../../contrib/libc-pwcache