svn commit: r228143 - in head: . share/mk tools/build/options

[Max Khon]

Author: fjoe
Date: Tue Nov 29 19:46:17 2011
New Revision: 228143
URL: http://svn.freebsd.org/changeset/base/228143

Log:
  Turn off profiled libs build by default.
  Can be enabled back using WITH_PROFILE=yes in /etc/src.conf

Added:
  head/tools/build/options/WITH_PROFILE
     - copied, changed from r227900, head/tools/build/options/WITHOUT_PROFILE
Deleted:
  head/tools/build/options/WITHOUT_PROFILE
Modified:
  head/Makefile.inc1
  head/share/mk/bsd.own.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Nov 29 19:45:58 2011	(r228142)
+++ head/Makefile.inc1	Tue Nov 29 19:46:17 2011	(r228143)
@@ -239,7 +239,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # build-tools stage
@@ -438,7 +438,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DWITHOUT_MAN -DWITHOUT_PROFILE libraries
+	    -DWITHOUT_MAN -DNO_PROFILE libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1321,8 +1321,8 @@ ${_lib}__PL: .PHONY
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} DIRPRFX=${_lib}/ obj; \
 		${MAKE} DIRPRFX=${_lib}/ depend; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1555,7 +1555,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
+	-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
 	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue Nov 29 19:45:58 2011	(r228142)
+++ head/share/mk/bsd.own.mk	Tue Nov 29 19:46:17 2011	(r228143)
@@ -388,7 +388,6 @@ __DEFAULT_YES_OPTIONS = \
     PMC \
     PORTSNAP \
     PPP \
-    PROFILE \
     QUOTAS \
     RCMDS \
     RCS \
@@ -423,7 +422,8 @@ __DEFAULT_NO_OPTIONS = \
     ICONV \
     IDEA \
     LIBCPLUSPLUS \
-    OFED
+    OFED \
+    PROFILE
 
 #
 # Default behaviour of some options depends on the architecture.  Unfortunately

Copied and modified: head/tools/build/options/WITH_PROFILE (from r227900, head/tools/build/options/WITHOUT_PROFILE)
==============================================================================
--- head/tools/build/options/WITHOUT_PROFILE	Wed Nov 23 18:15:49 2011	(r227900, copy source)
+++ head/tools/build/options/WITH_PROFILE	Tue Nov 29 19:46:17 2011	(r228143)
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to avoid compiling profiled libraries.
+Set to build profiled libraries.