From owner-svn-src-stable@FreeBSD.ORG Wed May 30 22:31:46 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A2B21065676; Wed, 30 May 2012 22:31:46 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02B1A8FC0A; Wed, 30 May 2012 22:31:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4UMVjlK084647; Wed, 30 May 2012 22:31:45 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4UMVjuv084641; Wed, 30 May 2012 22:31:45 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201205302231.q4UMVjuv084641@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 30 May 2012 22:31:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236342 - in stable/8: . gnu/usr.bin share/mk tools/build/options X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2012 22:31:46 -0000 Author: obrien Date: Wed May 30 22:31:45 2012 New Revision: 236342 URL: http://svn.freebsd.org/changeset/base/236342 Log: MFC: r222090: add WITH{,OUT}_{GCC,BINUTILS} providing fine-grained control Added: stable/8/tools/build/options/WITHOUT_BINUTILS - copied unchanged from r222090, head/tools/build/options/WITHOUT_BINUTILS stable/8/tools/build/options/WITHOUT_GCC - copied unchanged from r222090, head/tools/build/options/WITHOUT_GCC Modified: stable/8/Makefile.inc1 stable/8/gnu/usr.bin/Makefile (contents, props changed) stable/8/share/mk/bsd.own.mk Directory Properties: stable/8/ (props changed) stable/8/gnu/ (props changed) stable/8/gnu/usr.bin/ (props changed) stable/8/tools/ (props changed) stable/8/tools/build/options/ (props changed) Modified: stable/8/Makefile.inc1 ============================================================================== --- stable/8/Makefile.inc1 Wed May 30 22:28:08 2012 (r236341) +++ stable/8/Makefile.inc1 Wed May 30 22:31:45 2012 (r236342) @@ -1046,10 +1046,18 @@ _kgzip= usr.sbin/kgzip .endif .endif +.if ${MK_BINUTILS} != "no" +_binutils= gnu/usr.bin/binutils +.endif + +.if ${MK_GCC} != "no" +_cc= gnu/usr.bin/cc +.endif + cross-tools: .for _tool in \ - gnu/usr.bin/binutils \ - gnu/usr.bin/cc \ + ${_binutils} \ + ${_cc} \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ Modified: stable/8/gnu/usr.bin/Makefile ============================================================================== --- stable/8/gnu/usr.bin/Makefile Wed May 30 22:28:08 2012 (r236341) +++ stable/8/gnu/usr.bin/Makefile Wed May 30 22:31:45 2012 (r236342) @@ -53,12 +53,14 @@ _man= man _rcs= rcs .endif -.if ${MK_TOOLCHAIN} != "no" +.if ${MK_BINUTILS} != "no" _binutils= binutils +.endif +.if ${MK_GCC} != "no" _cc= cc +.endif .if ${MK_GDB} != "no" _gdb= gdb .endif -.endif .include Modified: stable/8/share/mk/bsd.own.mk ============================================================================== --- stable/8/share/mk/bsd.own.mk Wed May 30 22:28:08 2012 (r236341) +++ stable/8/share/mk/bsd.own.mk Wed May 30 22:31:45 2012 (r236342) @@ -315,6 +315,7 @@ WITH_IDEA= BIND_MTREE \ BIND_NAMED \ BIND_UTILS \ + BINUTILS \ BLUETOOTH \ BOOT \ BSD_CPIO \ @@ -335,6 +336,7 @@ WITH_IDEA= FP_LIBC \ FREEBSD_UPDATE \ GAMES \ + GCC \ GCOV \ GDB \ GNU \ @@ -504,6 +506,8 @@ MK_GROFF:= no .endif .if ${MK_TOOLCHAIN} == "no" +MK_BINUTILS:= no +MK_GCC:= no MK_GDB:= no .endif Copied: stable/8/tools/build/options/WITHOUT_BINUTILS (from r222090, head/tools/build/options/WITHOUT_BINUTILS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_BINUTILS Wed May 30 22:31:45 2012 (r236342, copy of r222090, head/tools/build/options/WITHOUT_BINUTILS) @@ -0,0 +1,7 @@ +.\" $FreeBSD$ +Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib, +ld, nm, objcopy, objdump, readelf, size and strip) +.Bf -symbolic +The option does not generally work for build targets, unless some alternative +toolchain is enabled. +.Ef Copied: stable/8/tools/build/options/WITHOUT_GCC (from r222090, head/tools/build/options/WITHOUT_GCC) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_GCC Wed May 30 22:31:45 2012 (r236342, copy of r222090, head/tools/build/options/WITHOUT_GCC) @@ -0,0 +1,6 @@ +.\" $FreeBSD$ +Set to not install gcc and g++. +.Bf -symbolic +The option does not generally work for build targets, unless some alternative +toolchain is enabled. +.Ef