Date: Tue, 28 Jan 2014 15:15:13 +0000 (UTC) From: Steven Kreuzer <skreuzer@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r261236 - in stable/10: share/man/man5 share/mk tools/build/options Message-ID: <201401281515.s0SFFDwc034175@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skreuzer (doc,ports committer) Date: Tue Jan 28 15:15:13 2014 New Revision: 261236 URL: http://svnweb.freebsd.org/changeset/base/261236 Log: Merge /head:261072: Remove WITHOUT_ATF from src.conf.5 Approved by: hrs (mentor) Deleted: stable/10/tools/build/options/WITHOUT_ATF Modified: stable/10/share/man/man5/src.conf.5 stable/10/share/mk/bsd.own.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man5/src.conf.5 ============================================================================== --- stable/10/share/man/man5/src.conf.5 Tue Jan 28 14:39:05 2014 (r261235) +++ stable/10/share/man/man5/src.conf.5 Tue Jan 28 15:15:13 2014 (r261236) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd December 9, 2013 +.Dd January 27, 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: stable/10/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: stable/10/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build @@ -624,9 +621,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: stable/10/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: stable/10/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: stable/10/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm Set to not build the Modified: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Tue Jan 28 14:39:05 2014 (r261235) +++ stable/10/share/mk/bsd.own.mk Tue Jan 28 15:15:13 2014 (r261236) @@ -251,7 +251,6 @@ __DEFAULT_YES_OPTIONS = \ ARM_EABI \ ASSERT_DEBUG \ AT \ - ATF \ ATM \ AUDIT \ AUTHPF \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401281515.s0SFFDwc034175>