Author: baggins Date: Mon Mar 2 15:32:14 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 4 - use dietlibc
---- Files affected: SPECS: module-init-tools.spec (1.69 -> 1.70) ---- Diffs: ================================================================ Index: SPECS/module-init-tools.spec diff -u SPECS/module-init-tools.spec:1.69 SPECS/module-init-tools.spec:1.70 --- SPECS/module-init-tools.spec:1.69 Mon Mar 2 16:16:54 2009 +++ SPECS/module-init-tools.spec Mon Mar 2 16:32:08 2009 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # # Conditional build -%bcond_without initrd # don't build initrd package -%bcond_without uClibc # don't link with uclibc, use glibc +%bcond_without initrd # don't build initrd package +%bcond_without dietlibc # don't link with dietlibc, use glibc # Summary: Module utilities without kerneld Summary(de.UTF-8): Module-Utilities @@ -15,7 +15,7 @@ Summary(uk.UTF-8): Утиліти для роботи з модулями ядра Name: module-init-tools Version: 3.5 -Release: 3 +Release: 4 License: GPL v2+ Group: Applications/System Source0: http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2 @@ -36,7 +36,7 @@ BuildRequires: glibc-static BuildRequires: zlib-static %if %{with initrd} -%{?with_uClibc:BuildRequires: uClibc-static >= 3:0.9.29-23} +%{?with_dietlibc:BuildRequires: dietlibc-static} %endif Obsoletes: modutils BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -82,12 +82,11 @@ %if %{with initrd} %configure \ - %{?with_uClibc:LDFLAGS="%{rpmldflags} -static"} \ - %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ + %{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static"} \ + %{!?with_dietlibc:CC="%{__cc} -static"} \ --enable-zlib -%{__make} \ - ZLIB=/usr/lib/libz.a +%{__make} %{__make} install-exec-am \ DESTDIR=initrd-mod @@ -157,6 +156,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2009/03/02 15:32:08 baggins +- rel 4 +- use dietlibc + Revision 1.69 2009/03/02 15:16:54 baggins - rel 3 - added initrd package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
