SPECS: klibc.spec - don't copy kernel headers. smart linking is en...

pluto pluto at pld-linux.org
Thu Sep 29 15:32:56 CEST 2005


Author: pluto                        Date: Thu Sep 29 13:32:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't copy kernel headers. smart linking is enough.
- split to -devel,-static and shared lib.
- release 1.

---- Files affected:
SPECS:
   klibc.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/klibc.spec
diff -u SPECS/klibc.spec:1.38 SPECS/klibc.spec:1.39
--- SPECS/klibc.spec:1.38	Thu Sep 29 13:43:24 2005
+++ SPECS/klibc.spec	Thu Sep 29 15:32:51 2005
@@ -7,7 +7,7 @@
 Summary(pl):	Zminimalizowany podzbiór biblioteki C do używania z initramfs
 Name:		klibc
 Version:	1.1.1
-Release:	0.1
+Release:	1
 License:	BSD/GPL
 Group:		Libraries
 Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
@@ -18,7 +18,6 @@
 %{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4}
 BuildRequires:	rpmbuild(macros) >= 1.153
 BuildRequires:	perl-base
-%{?with_dist_kernel:Requires:	kernel-headers >= 2.4}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -35,6 +34,32 @@
 szybkość. klibc jest rozwijaną biblioteką w związku z czym nadal
 brakuje wielu rzeczy.
 
+%package devel
+Summary:	Development files for klibc
+Summary(pl):	Pliki dla programistów klibc
+Group:		Development/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	binutils
+%{?with_dist_kernel:Requires:	kernel-headers >= 2.4}
+
+%description devel
+Small libc for building embedded applications - development files.
+
+%description devel -l pl
+Mała libc do budowania aplikacji wbudowanych - pliki dla programistów.
+
+%package static
+Summary:	Static klibc libraries
+Summary(pl):	Biblioteki statyczne klibc
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+
+%description static
+Static klibc libraries.
+
+%description static -l pl
+Biblioteki statyczne klibc.
+
 %package utils-shared
 Summary:	Utilities dynamically linked with klibc
 Summary(pl):	Narzędzia dynamicznie zlinkowane z klibc
@@ -66,11 +91,15 @@
 %build
 cd include
 rm -rf asm asm-generic linux
-cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch} .
+ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} .
 ln -sf asm-%{_target_base_arch} asm
-cp -a %{_kernelsrcdir}/include/asm-generic .
-cp -a %{_kernelsrcdir}/include/linux .
-%{?with_dist_kernel:cp -a %{_kernelsrcdir}/include/linux/autoconf-up.h linux/autoconf.h}
+ln -sf %{_kernelsrcdir}/include/asm-generic .
+ln -sf %{_kernelsrcdir}/include/linux .
+%if %{with dist_kernel}
+[ ! -d arch/%{_target_base_arch}/linux ] && mkdir arch/%{_target_base_arch}/linux
+ln -sf  %{_kernelsrcdir}/include/linux/autoconf-up.h arch/%{_target_base_arch}/linux/autoconf.h
+%endif
+for a in `ls arch`; do [ "$a" != "%{_target_base_arch}" ] && rm -rf arch/$a; done
 cd ..
 
 %{__make} \
@@ -90,7 +119,6 @@
 install -d $RPM_BUILD_ROOT%{_libdir}/klibc/bin-{shared,static}
 
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/klibc
-
 install klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc
 install klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1
 install klibc/libc.* klibc/crt0.o klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc
@@ -104,14 +132,20 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/klibc*.so
+
+%files devel
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/klcc
 %{_includedir}/klibc
 %dir %{_libdir}/klibc
 %attr(755,root,root) %{_libdir}/klibc/*.so
-%{_libdir}/klibc/*.so.hash
-%{_libdir}/klibc/*.[ao]
+%{_libdir}/klibc/*.o
 %{_mandir}/man1/*
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/klibc/*.a
+
 %files utils-shared
 %defattr(644,root,root,755)
 %dir %{_libdir}/klibc/bin-shared
@@ -128,6 +162,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2005/09/29 13:32:51  pluto
+- don't copy kernel headers. smart linking is enough.
+- split to -devel,-static and shared lib.
+- release 1.
+
 Revision 1.38  2005/09/29 11:43:24  pluto
 - updated to 1.1.1.
 - /%{_lib}/klibc-*.so loader added (shared binaries works fine now).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/klibc.spec?r1=1.38&r2=1.39&f=u




More information about the pld-cvs-commit mailing list