summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorskreuzer <skreuzer@FreeBSD.org>2014-01-23 03:14:48 +0000
committerskreuzer <skreuzer@FreeBSD.org>2014-01-23 03:14:48 +0000
commit797a92431bdb3c65bd298fc5e0ca549b92425673 (patch)
treeff320182145a9016cbda5c499efc2c216ec1b327 /share
parent854854091c98db93f135751c84acccc72fca1350 (diff)
downloadFreeBSD-src-797a92431bdb3c65bd298fc5e0ca549b92425673.zip
FreeBSD-src-797a92431bdb3c65bd298fc5e0ca549b92425673.tar.gz
Remove WITHOUT_ATF as it has been replaced by WITH_TESTS
PR: conf/185326 Reported by: Igor Mozolevsky <igor@hybrid-lab.co.uk> Approved by: hrs (mentor)
Diffstat (limited to 'share')
-rw-r--r--share/man/man5/src.conf.517
-rw-r--r--share/mk/bsd.own.mk1
2 files changed, 4 insertions, 14 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index e740244..9788436 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
.\" $FreeBSD$
-.Dd December 4, 2013
+.Dd January 21, 2014
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -113,9 +113,6 @@ checks.
Set to not build
.Xr at 1
and related utilities.
-.It Va WITHOUT_ATF
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ATF 241823 2012-10-22 01:18:41Z marcel
-Set to not build programs and libraries related to the ATF testing framework.
.It Va WITHOUT_ATM
.\" from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru
Set to not build
@@ -245,12 +242,6 @@ and
.Pp
It is a default setting on
arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_LLDB
-.El
.It Va WITH_CLANG_IS_CC
.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 235342 2012-05-12 16:12:36Z gjb
Set to install the Clang C/C++ compiler as
@@ -627,9 +618,9 @@ and
On amd64, set to not build 32-bit library set and a
.Nm ld-elf32.so.1
runtime linker.
-.It Va WITHOUT_LIBCPLUSPLUS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim
-Set to avoid building libcxxrt and libc++.
+.It Va WITH_LIBCPLUSPLUS
+.\" from FreeBSD: head/tools/build/options/WITH_LIBCPLUSPLUS 228082 2011-11-28 17:56:46Z dim
+Set to build libcxxrt and libc++.
.It Va WITHOUT_LIBPTHREAD
.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm
Set to not build the
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6aaf320..944de01 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -251,7 +251,6 @@ __DEFAULT_YES_OPTIONS = \
ARM_EABI \
ASSERT_DEBUG \
AT \
- ATF \
ATM \
AUDIT \
AUTHPF \
OpenPOWER on IntegriCloud