From owner-svn-src-head@freebsd.org Wed Apr 19 18:59:39 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0528D45D16; Wed, 19 Apr 2017 18:59:39 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 655691E4; Wed, 19 Apr 2017 18:59:39 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JIxcTi048810; Wed, 19 Apr 2017 18:59:38 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JIxc57048808; Wed, 19 Apr 2017 18:59:38 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201704191859.v3JIxc57048808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 19 Apr 2017 18:59:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317158 - in head: share/man/man5 share/mk tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 18:59:39 -0000 Author: emaste Date: Wed Apr 19 18:59:38 2017 New Revision: 317158 URL: https://svnweb.freebsd.org/changeset/base/317158 Log: Remove WITHOUT_GNU and WITHOUT_GNU_SUPPORT src.conf.knobs These have no effect (and WITHOUT_GNU is documented as having no effect). I intend to later introduce a WITHOUT_GPL knob to serve a similar purpose as WITHOUT_GNU's previously documented intent, but with a more accurate name. To avoid confusion over the transition though just remove the existing, nonfunctional ones. Deleted: head/tools/build/options/WITHOUT_GNU head/tools/build/options/WITHOUT_GNU_SUPPORT Modified: head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Apr 19 18:35:34 2017 (r317157) +++ head/share/man/man5/src.conf.5 Wed Apr 19 18:59:38 2017 (r317158) @@ -1,6 +1,6 @@ -.\" DO NOT EDIT-- this file is automatically generated. +.\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd April 18, 2017 +.Dd April 19, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -700,19 +700,6 @@ Set to build .Pp This is a default setting on arm/arm, arm/armeb, arm/armv6 and sparc64/sparc64. -.It Va WITHOUT_GNU -Set to not build contributed GNU software as a part of the base system. -This option can be useful if the system built must not contain any code -covered by the GNU Public License due to legal reasons. -.Bf -symbolic -The option has no effect yet. -.Ef -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_GNU_SUPPORT -.El .It Va WITHOUT_GNUCXX Do not build the GNU C++ stack (g++, libstdc++). This is the default on platforms where clang is the system compiler. @@ -736,8 +723,6 @@ Set to not build GNU .It Va WITHOUT_GNU_GREP_COMPAT Set this option to omit the gnu extensions to grep from being included in BSD grep. -.It Va WITHOUT_GNU_SUPPORT -Set to build some programs without optional GNU support. .It Va WITHOUT_GPIO Set to not build .Xr gpioctl 8 Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Apr 19 18:35:34 2017 (r317157) +++ head/share/mk/src.opts.mk Wed Apr 19 18:59:38 2017 (r317158) @@ -96,7 +96,6 @@ __DEFAULT_YES_OPTIONS = \ FTP \ GAMES \ GCOV \ - GNU \ GNU_DIFF \ GNU_GREP \ GNU_GREP_COMPAT \ @@ -450,7 +449,6 @@ MK_${vv:H}:= ${MK_${vv:T}} .for var in \ BLACKLIST \ BZIP2 \ - GNU \ INET \ INET6 \ KERBEROS \