From cebea500a08f155480797338226699c64b85a06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= Date: Wed, 6 Apr 2011 20:19:07 +0000 Subject: [PATCH] Regenerate after r220401. It turns out makeman is clever about implied flags, so remove that part from WITHOUT_CXX again. This is only partially regenerated, as the entries for FDT and GPIO seem to have switched their default state, too. --- share/man/man5/src.conf.5 | 19 +++++++++++++++++-- tools/build/options/WITHOUT_CXX | 6 +----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f98e1f11950e..57948af2d55b 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 188848 2009-02-20 11:09:55Z mtm .\" $FreeBSD$ -.Dd February 22, 2011 +.Dd April 6, 2011 .Dt SRC.CONF 5 .Os .Sh NAME @@ -285,10 +285,22 @@ and related utilities. .\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru Set to not build CVS. .It Va WITHOUT_CXX -.\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 156932 2006-03-21 07:50:50Z ru +.\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220401 2011-04-06 20:08:23Z uqs Set to not build .Xr g++ 1 and related libraries. +It will also prevent building of +.Xr gperf 1 +and +.Xr devd 8 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_CLANG +.It +.Va WITHOUT_GROFF +.El .It Va WITHOUT_DICT .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru Set to not build the Webster dictionary files. @@ -375,6 +387,9 @@ Set to build Hesiod support. .It Va WITHOUT_HTML .\" from FreeBSD: head/tools/build/options/WITHOUT_HTML 156932 2006-03-21 07:50:50Z ru Set to not build HTML docs. +.It Va WITH_ICONV +.\" from FreeBSD: head/tools/build/options/WITH_ICONV 219020 2011-02-25 00:10:26Z gabor +Set to build iconv as part of libc. .It Va WITH_IDEA .\" from FreeBSD: head/tools/build/options/WITH_IDEA 156932 2006-03-21 07:50:50Z ru Set to build the IDEA encryption code. diff --git a/tools/build/options/WITHOUT_CXX b/tools/build/options/WITHOUT_CXX index 51e80424eec2..541cc3c2c21e 100644 --- a/tools/build/options/WITHOUT_CXX +++ b/tools/build/options/WITHOUT_CXX @@ -2,11 +2,7 @@ Set to not build .Xr g++ 1 and related libraries. -Implies -.Dv WITHOUT_CLANG -and -.Dv WITHOUT_GROFF -and will also prevent building of +It will also prevent building of .Xr gperf 1 and .Xr devd 8 .