From owner-cvs-src@FreeBSD.ORG  Wed Nov  1 09:02:12 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5EBE916A40F;
	Wed,  1 Nov 2006 09:02:12 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C14B743D5E;
	Wed,  1 Nov 2006 09:02:11 +0000 (GMT) (envelope-from jb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA192BGY067378;
	Wed, 1 Nov 2006 09:02:11 GMT (envelope-from jb@repoman.freebsd.org)
Received: (from jb@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA192BBd067377;
	Wed, 1 Nov 2006 09:02:11 GMT (envelope-from jb)
Message-Id: <200611010902.kA192BBd067377@repoman.freebsd.org>
From: John Birrell <jb@FreeBSD.org>
Date: Wed, 1 Nov 2006 09:02:11 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/share/mk bsd.own.mk src/tools/build/options
 WITHOUT_CDDL
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Nov 2006 09:02:12 -0000

jb          2006-11-01 09:02:11 UTC

  FreeBSD src repository

  Modified files:
    share/mk             bsd.own.mk 
  Added files:
    tools/build/options  WITHOUT_CDDL 
  Log:
  Add a build option to support WITH_CDDL and WITHOUT_CDDL, defaulting
  to WITH_CDDL.
  
  This option enables building code that is licensed under Sun's CDDL.
  The DTrace code is licensed that way, so by default it will get built
  unless the WITHOUT_CDDL option is used.
  
  There is another build toggle, NO_CTF, which turns off execution of
  ctfconvert and ctfmerge in sys.mk, but this can't be implemented as
  WITH_/WITHOUT because bsd.own.mk isn't included in all Makefiles and
  sys.mk is included automatically by make.
  
  Revision  Changes    Path
  1.58      +1 -0      src/share/mk/bsd.own.mk
  1.1       +2 -0      src/tools/build/options/WITHOUT_CDDL (new)