SPECS: device-mapper.spec - build also uclibc version of initrd-de...

[glen]

Author: glen                         Date: Sun May 21 14:27:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build also uclibc version of initrd-devel (for lvm2)

---- Files affected:
SPECS:
   device-mapper.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.55 SPECS/device-mapper.spec:1.56
--- SPECS/device-mapper.spec:1.55	Sat May 20 14:33:40 2006
+++ SPECS/device-mapper.spec	Sun May 21 16:26:55 2006
@@ -8,7 +8,7 @@
 Summary(pl):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Name:		device-mapper
 Version:	1.02.07
-Release:	0.3
+Release:	0.8
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
@@ -22,6 +22,7 @@
 BuildRequires:	automake
 %{?with_initrd:BuildRequires:	klibc-static}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.10}
+%{?with_initrd:BuildRequires:	uClibc-static >= 0.9.26}
 %{?with_selinux:Requires:	libselinux >= 1.10}
 Conflicts:	dev < 2.9.0-8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -126,6 +127,7 @@
 %{__autoconf}
 
 %if %{with initrd}
+# kcc
 %configure \
 	CC="klcc -static" \
 	--disable-selinux \
@@ -140,7 +142,22 @@
 %{__make}
 
 cp -a dmsetup/dmsetup.static initrd-dmsetup
-cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper.a
+cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-klibc.a
+%{__make} clean
+
+# uclibc (for lvm2)
+%configure \
+	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
+	ac_cv_lib_dl_dlopen=no \
+	--with-optimisation="-Os" \
+	--enable-static_link \
+	--with-lvm1=internal \
+	--disable-selinux \
+	--disable-nls
+sed -i -e 's#rpl_malloc#malloc#g' include/configure.h
+%{__make}
+
+cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-uclibc.a
 %{__make} clean
 %endif
 
@@ -156,7 +173,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name},/usr/{%{_lib},include}/klibc}
+install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -172,9 +189,12 @@
 install dmeventd/libdevmapper-event.a $RPM_BUILD_ROOT%{_libdir}
 
 %if %{with initrd}
+install -d $RPM_BUILD_ROOT/usr/{{%{_lib},include}/klibc,%{_target_cpu}-linux-uclibc/{lib,usr/include}}
 install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}
-install initrd-libdevmapper.a $RPM_BUILD_ROOT/usr/%{_lib}/klibc/libdevmapper.a
+install initrd-libdevmapper-klibc.a $RPM_BUILD_ROOT/usr/%{_lib}/klibc/libdevmapper.a
+install initrd-libdevmapper-uclibc.a $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/%{_lib}/libdevmapper.a
 install include/libdevmapper.h $RPM_BUILD_ROOT/usr/include/klibc
+install include/libdevmapper.h $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include
 %endif
 
 %clean
@@ -215,7 +235,9 @@
 %files initrd-devel
 %defattr(644,root,root,755)
 %{_prefix}/%{_lib}/klibc/libdevmapper.a
+%{_prefix}/%{_target_cpu}-linux-uclibc/lib
 %{_includedir}/klibc/libdevmapper.h
+%{_prefix}/%{_target_cpu}-linux-uclibc/usr/include/libdevmapper.h
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -224,6 +246,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2006/05/21 14:26:55  glen
+- build also uclibc version of initrd-devel (for lvm2)
+
 Revision 1.55  2006/05/20 12:33:40  glen
 - --disable-nls for initrd (from lvm2.spec)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/device-mapper.spec?r1=1.55&r2=1.56&f=u