Author: glen Date: Fri Oct 14 15:23:46 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- dietlibc bcond rename
---- Files affected:
SPECS:
udev.spec (1.101 -> 1.102)
---- Diffs:
================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.101 SPECS/udev.spec:1.102
--- SPECS/udev.spec:1.101 Fri Oct 14 17:19:00 2005
+++ SPECS/udev.spec Fri Oct 14 17:23:40 2005
@@ -6,12 +6,12 @@
%bcond_without initrd # build without udev-initrd
%bcond_without uClibc # link initrd version with static uClibc
%bcond_with klibc # link initrd version with static klibc
-%bcond_with diet # link initrd version with static dietlibc (currently
broken and unsupported)
+%bcond_with dietlibc # link initrd version with static dietlibc
(currently broken and unsupported)
%bcond_with glibc # link initrd version with static glibc
%bcond_without main # don't compile main package, use for debugging initrd
build
# if one of the *libc is enabled disable default uClibc
-%if %{with diet} && %{with uClibc}
+%if %{with dietlibc} && %{with uClibc}
%undefine with_uClibc
%endif
@@ -45,7 +45,7 @@
BuildRequires: libselinux-devel >= 1.17.13
BuildRequires: sed >= 4.0
%if %{with initrd}
-%{?with_diet:BuildRequires: dietlibc-static}
+%{?with_dietlibc:BuildRequires: dietlibc-static}
%{?with_uClibc:BuildRequires: uClibc-static >= 0.9.28}
%{?with_glibc:BuildRequires: glibc-static}
%{?with_klibc:BuildRequires: klibc-static}
@@ -94,8 +94,8 @@
udevdir=/dev \
%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
%{?with_uClibc:LD="%{_target_cpu}-uclibc-gcc %{rpmldflags} -static"} \
- %{?with_diet:CC="%{_target_cpu}-dietlibc-gcc"} \
- %{?with_diet:LD="%{_target_cpu}-dietlibc-gcc %{rpmldflags} -static"} \
+ %{?with_dietlibc:CC="%{_target_cpu}-dietlibc-gcc"} \
+ %{?with_dietlibc:LD="%{_target_cpu}-dietlibc-gcc %{rpmldflags}
-static"} \
%{?with_glibc:CC="%{_target_cpu}-pld-linux-gcc"} \
%{?with_glibc:LD="%{_target_cpu}-pld-linux-gcc %{rpmldflags} -static"} \
%{?with_klibc:CC="klcc"} \
@@ -235,6 +235,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.102 2005/10/14 15:23:40 glen
+- dietlibc bcond rename
+
Revision 1.101 2005/10/14 15:19:00 glen
- bcond to link initrd with klibc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.101&r2=1.102&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
