From 87d0f81ce73a31ed334b69c7995e6ed4f8abc1dc Mon Sep 17 00:00:00 2001 From: John Birrell Date: Wed, 1 Nov 2006 09:02:11 +0000 Subject: [PATCH] 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. --- share/mk/bsd.own.mk | 1 + tools/build/options/WITHOUT_CDDL | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 tools/build/options/WITHOUT_CDDL diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index ea660dde07b..790582f4ccc 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -295,6 +295,7 @@ WITH_IDEA= BLUETOOTH \ BOOT \ CALENDAR \ + CDDL \ CPP \ CRYPT \ CVS \ diff --git a/tools/build/options/WITHOUT_CDDL b/tools/build/options/WITHOUT_CDDL new file mode 100644 index 00000000000..909c52ba716 --- /dev/null +++ b/tools/build/options/WITHOUT_CDDL @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build code licensed under Sun's CDDL.