Author: glen Date: Fri Oct 14 15:19:05 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- bcond to link initrd with klibc
---- Files affected:
SPECS:
udev.spec (1.100 -> 1.101)
---- Diffs:
================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.100 SPECS/udev.spec:1.101
--- SPECS/udev.spec:1.100 Fri Oct 14 17:02:10 2005
+++ SPECS/udev.spec Fri Oct 14 17:19:00 2005
@@ -1,24 +1,28 @@
# $Revision$, $Date$
# TODO
-# - add klibc?
# - initrd build with uclibc on amd64 produces non-working binary (illegal
instruction from open("/dev/null"))
#
# Conditional build:
%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 glibc # link initrd version with static glibc
-%bcond_without main # compile only main program, use for debugging initrd
build
+%bcond_without main # don't compile main package, use for debugging initrd
build
-# can't have them both
-%if %{with uClibc} && %{with diet}
-%undefine with_diet
+# if one of the *libc is enabled disable default uClibc
+%if %{with diet} && %{with uClibc}
+%undefine with_uClibc
%endif
%if %{with glibc} && %{with uClibc}
%undefine with_uClibc
%endif
+%if %{with klibc} && %{with uClibc}
+%undefine with_uClibc
+%endif
+
Summary: A userspace implementation of devfs
Summary(pl): Implementacja devfs w przestrzeni użytkownika
Name: udev
@@ -44,6 +48,8 @@
%{?with_diet:BuildRequires: dietlibc-static}
%{?with_uClibc:BuildRequires: uClibc-static >= 0.9.28}
%{?with_glibc:BuildRequires: glibc-static}
+%{?with_klibc:BuildRequires: klibc-static}
+%{?with_klibc:BuildRequires: linux-libc-headers}
%endif
Requires: coreutils
Requires: hotplug >= 2003_08_05
@@ -92,6 +98,8 @@
%{?with_diet: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"} \
+ %{?with_klibc:LD="klcc %{rpmldflags} -static"} \
DEBUG=%{!?debug:false}%{?debug:true} \
OPTIMIZATION="%{rpmcflags}" \
USE_KLIBC=false \
@@ -227,6 +235,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.101 2005/10/14 15:19:00 glen
+- bcond to link initrd with klibc
+
Revision 1.100 2005/10/14 15:02:10 glen
- bcond for compiling initrd with glibc and skipping main package build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.100&r2=1.101&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
