SPECS: udev.spec - add dietlibc bcond

[glen]

Author: glen                         Date: Sat Sep 17 10:58:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add dietlibc bcond

---- Files affected:
SPECS:
   udev.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.92 SPECS/udev.spec:1.93
--- SPECS/udev.spec:1.92	Sat Sep 17 10:31:02 2005
+++ SPECS/udev.spec	Sat Sep 17 12:57:58 2005
@@ -1,9 +1,17 @@
 # $Revision$, $Date$
+# TODO
+# - add klibc?
 #
 # Conditional build:
 %bcond_without	initrd	# build without udev-initrd
-%bcond_without	uClibc	# link initrd version with static dietlibc instead of uClibc
-                        # (currently broken and unsupported)
+%bcond_without	uClibc	# link initrd version with static uClibc
+%bcond_with		diet	# link initrd version with static dietlibc (currently broken and unsupported)
+
+# can't have them both
+%if %{with uClibc} && %{with diet}
+%undefine	with_uClibc
+%endif
+
 Summary:	A userspace implementation of devfs
 Summary(pl):	Implementacja devfs w przestrzeni użytkownika
 Name:		udev
@@ -25,7 +33,7 @@
 BuildRequires:	libselinux-devel >= 1.17.13
 BuildRequires:	sed >= 4.0
 %if %{with initrd}
-%{!?with_uClibc:BuildRequires:	dietlibc-static}
+%{?with_diet:BuildRequires:	dietlibc-static}
 %{?with_uClibc:BuildRequires:	uClibc-static >= 0.9.28}
 %endif
 Requires:	coreutils
@@ -71,8 +79,8 @@
 	udevdir=/dev \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
 	%{?with_uClibc:LD="%{_target_cpu}-uclibc-gcc %{rpmldflags} -static"} \
-	%{!?with_uClibc:CC="%{_target_cpu}-dietlibc-gcc"} \
-	%{!?with_uClibc:LD="%{_target_cpu}-dietlibc-gcc %{rpmldflags} -static"} \
+	%{?with_diet:CC="%{_target_cpu}-dietlibc-gcc"} \
+	%{?with_diet:LD="%{_target_cpu}-dietlibc-gcc %{rpmldflags} -static"} \
 	%{!?debug:DEBUG=false} \
 	OPTIMIZATION="%{rpmcflags}" \
 	USE_KLIBC=false \
@@ -194,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2005/09/17 10:57:58  glen
+- add dietlibc bcond
+
 Revision 1.92  2005/09/17 08:31:02  arekm
 - up to 070
 
@@ -232,7 +243,7 @@
 
 Revision 1.80  2005/09/04 10:47:27  freetz
 - updated to 068, massive cleanup, dropped check-cdrom script (make use of
-  included utility), more %%files, rel.1
+  included utility), more %files, rel.1
 
 Revision 1.79  2005/07/31 15:30:42  jpc
 - fixed permisions for the hotplug symlink
@@ -255,7 +266,7 @@
 - updated to 058
 
 Revision 1.74  2005/05/21 14:17:06  speedy
-- bcond: without_uClibc [use dietlibc instead - default on %%{x8664)]
+- bcond: without_uClibc [use dietlibc instead - default on %{x8664)]
 
 Revision 1.73  2005/05/03 04:12:53  wrobell
 - ver. 057
@@ -290,7 +301,7 @@
 - rel 2
 
 Revision 1.63  2004/11/21 09:33:54  arekm
-046
+- 046
 
 Revision 1.62  2004/11/18 09:32:44  qboosh
 - dropped bogus source0-size
@@ -347,7 +358,7 @@
 - removed version from O: dev
 
 Revision 1.44  2004/09/26 23:23:07  arekm
-Obsolete: dev; provide three base /dev entries
+- Obsolete: dev; provide three base /dev entries
 
 Revision 1.43  2004/09/25 22:05:14  arekm
 - use uclibc for initrd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.92&r2=1.93&f=u