[commits] r1862 - in /trunk/libc: ChangeLog.eglibc Makerules math/Makefile option-groups.def option-groups.defaults

[jimb@xxxxxxxxxx]

Author: jimb
Date: Sat Mar 31 13:51:14 2007
New Revision: 1862

Log:
	Add the OPTION_EGLIBC_LIBM option group.
	* option-groups.def (OPTION_EGLIBC_LIBM): New entry.
	* option-groups.defaults (OPTION_EGLIBC_LIBM): Set default value.
	* math/Makefile: include ../option-groups.mak.
	Add libm to OPTION_EGLIBC_LIBM option group.
	* Makerules (extra-libs, extra-libs-others): Let option groups
	control these values, too.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/Makerules
    trunk/libc/math/Makefile
    trunk/libc/option-groups.def
    trunk/libc/option-groups.defaults

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Sat Mar 31 13:51:14 2007
@@ -1,3 +1,13 @@
+2007-03-31  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	Add the OPTION_EGLIBC_LIBM option group.
+	* option-groups.def (OPTION_EGLIBC_LIBM): New entry.
+	* option-groups.defaults (OPTION_EGLIBC_LIBM): Set default value.
+	* math/Makefile: include ../option-groups.mak.
+	Add libm to OPTION_EGLIBC_LIBM option group.
+	* Makerules (extra-libs, extra-libs-others): Let option groups
+	control these values, too.
+
 2007-03-22  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Run tests that set LD_PRELOAD properly, even when

Modified: trunk/libc/Makerules
==============================================================================
--- trunk/libc/Makerules (original)
+++ trunk/libc/Makerules Sat Mar 31 13:51:14 2007
@@ -406,14 +406,16 @@
 endif
 
 # Include targets in the selected option groups.
-routines     += $(routines-y)
-others       += $(others-y)
-install-bin  += $(install-bin-y)
-install-sbin += $(install-sbin-y)
-extra-objs   += $(extra-objs-y)
-tests        += $(tests-y)
-xtests       += $(xtests-y)
-test-srcs    += $(test-srcs-y)
+routines     	  += $(routines-y)
+others       	  += $(others-y)
+extra-libs   	  += $(extra-libs-y)
+extra-libs-others += $(extra-libs-others-y)
+install-bin  	  += $(install-bin-y)
+install-sbin 	  += $(install-sbin-y)
+extra-objs   	  += $(extra-objs-y)
+tests        	  += $(tests-y)
+xtests       	  += $(xtests-y)
+test-srcs    	  += $(test-srcs-y)
 
 
 # Modify the list of routines we build for different targets

Modified: trunk/libc/math/Makefile
==============================================================================
--- trunk/libc/math/Makefile (original)
+++ trunk/libc/math/Makefile Sat Mar 31 13:51:14 2007
@@ -20,6 +20,8 @@
 # Makefile for the math library.
 
 subdir		:= math
+
+include ../option-groups.mak
 
 # Installed header files.
 headers		:= math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
@@ -35,8 +37,8 @@
 
 # Build the -lm library.
 
-extra-libs	:= libm
-extra-libs-others = $(extra-libs)
+extra-libs-$(OPTION_EGLIBC_LIBM) := libm
+extra-libs-others-$(OPTION_EGLIBC_LIBM) = $(extra-libs-$(OPTION_EGLIBC_LIBM))
 
 libm-support = k_standard s_lib_version s_matherr s_signgam		\
 	       fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg		\

Modified: trunk/libc/option-groups.def
==============================================================================
--- trunk/libc/option-groups.def (original)
+++ trunk/libc/option-groups.def Sat Mar 31 13:51:14 2007
@@ -49,3 +49,21 @@
        This option group includes all locale definitions other than
        that for the "C" locale.  If this option group is omitted, then
        only the "C" locale is supported.
+
+config OPTION_EGLIBC_LIBM
+   bool "libm (math library)"
+   help
+       This option group includes the 'libm' library, containing
+       mathematical functions.  If this option group is omitted, then
+       an EGLIBC installation does not include shared or unshared versions
+       of the math library.
+
+       Note that this does not remove all floating-point related
+       functionality from EGLIBC; for example, 'printf' and 'scanf'
+       can still print and read floating-point values with this option
+       group disabled.
+
+       Note that the ISO Standard C++ library 'libstdc++' depends on
+       EGLIBC's math library 'libm'.  If you disable this option
+       group, you will not be able to build 'libstdc++' against the
+       resulting EGLIBC installation.

Modified: trunk/libc/option-groups.defaults
==============================================================================
--- trunk/libc/option-groups.defaults (original)
+++ trunk/libc/option-groups.defaults Sat Mar 31 13:51:14 2007
@@ -10,3 +10,4 @@
 # By default, all option groups are enabled.
 OPTION_EGLIBC_CATGETS = y
 OPTION_EGLIBC_LOCALES = y
+OPTION_EGLIBC_LIBM = y