packages: lvm2/lvm2.spec - simplify dep system: enable glibc if both altern...

[glen]

Author: glen                         Date: Fri Jul 30 16:07:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify dep system: enable glibc if both alternative libc disabled

---- Files affected:
packages/lvm2:
   lvm2.spec (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.158 packages/lvm2/lvm2.spec:1.159
--- packages/lvm2/lvm2.spec:1.158	Fri Jul 30 18:04:14 2010
+++ packages/lvm2/lvm2.spec	Fri Jul 30 18:07:08 2010
@@ -4,11 +4,11 @@
 #
 # Conditional build:
 %bcond_without	initrd		# don't build initrd version
-%bcond_with	uClibc		# link initrd version with uClibc
+%bcond_with	uClibc			# link initrd version with uClibc
 %bcond_without	dietlibc	# link initrd version with dietlibc
-%bcond_with	glibc		# link initrd version with static glibc
+%bcond_with	glibc			# link initrd version with static GLIBC
 %bcond_without	clvmd		# don't build clvmd
-%bcond_with	clvmd3		# build clvmd for 3rd generation of cluster
+%bcond_with	clvmd3			# build clvmd for 3rd generation of cluster
 %bcond_without	selinux		# disable SELinux
 
 %ifarch sparc64 sparc
@@ -25,10 +25,16 @@
 %undefine	with_dietlibc
 %endif
 
+# with glibc disables default dietlibc
 %if %{with glibc} && %{with dietlibc}
 %undefine	with_dietlibc
 %endif
 
+# fallback is glibc if neither alternatives are enabled
+%if %{without dietlibc} && %{without uClibc}
+%define		with_glibc	1
+%endif
+
 %if %{with clvmd3}
 %undefine	with_clvmd
 %endif
@@ -402,6 +408,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.159  2010/07/30 16:07:08  glen
+- simplify dep system: enable glibc if both alternative libc disabled
+
 Revision 1.158  2010/07/30 16:04:14  glen
 - disable arch dietlibc without floor in -lm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.158&r2=1.159&f=u