X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=788057a38319294961e317dd34e488e41e9c7cc5;hp=667ef8ab21e1df9982a86bfb50cbfe979f94ee96;hb=e08212532bfd497273b11c82b8eabef9bd9d464e;hpb=278b233a31dc760782d70e1c17a29374e1a0c50a diff --git a/klibc.spec b/klibc.spec index 667ef8a..788057a 100644 --- a/klibc.spec +++ b/klibc.spec @@ -1,22 +1,26 @@ # +# TODO: +# - warning: Installed (but unpackaged) file(s) found: +# /usr/lib/klibc/libc.so.hash +# # Conditional build: %bcond_without dist_kernel # build without distribution kernel-headers +%bcond_with verbose # verbose build # Summary: Minimalistic libc subset for use with initramfs -Summary(pl): Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs +Summary(pl.UTF-8): Zminimalizowany podzbiór biblioteki C do używania z initramfs Name: klibc -Version: 1.1.16 +Version: 1.5.18 Release: 1 License: BSD/GPL Group: Libraries -Source0: http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2 -# Source0-md5: 80b85e84306695ed61049720008dd409 +Source0: http://www.kernel.org/pub/linux/libs/klibc/Current/%{name}-%{version}.tar.bz2 +# Source0-md5: 5c8b6577b9acb3809cace6e118cdd55b Patch0: %{name}-klcc.patch -Patch1: %{name}-kill_interp_sohash.patch URL: http://www.zytor.com/mailman/listinfo/klibc/ -%{?with_dist_kernel:BuildRequires: kernel-headers >= 2.4} BuildRequires: bison BuildRequires: flex +BuildRequires: linux-libc-headers >= 7:2.6.24-1 BuildRequires: rpmbuild(macros) >= 1.153 BuildRequires: perl-base BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,97 +33,122 @@ initramfs. It is deliberately written for small size, minimal entaglement and portability, not speed. It is definitely a work in progress, and a lot of things are still missing. -%description -l pl -klibc w zamierzeniu ma byæ minimalistycznym podzbiorem biblioteki libc -do u¿ycia z initramfs. Celem jest minimalizacja, przeno¶no¶æ ale nie -szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal +%description -l pl.UTF-8 +klibc w zamierzeniu ma być minimalistycznym podzbiorem biblioteki libc +do użycia z initramfs. Celem jest minimalizacja, przenośność ale nie +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 +Summary(pl.UTF-8): Pliki dla programistów klibc Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: binutils -%{?with_dist_kernel:Requires: kernel-headers >= 2.4} +Requires: linux-libc-headers >= 7:2.6.24-1 %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. +%description devel -l pl.UTF-8 +Mała libc do budowania aplikacji wbudowanych - pliki dla programistów. %package static Summary: Static klibc libraries -Summary(pl): Biblioteki statyczne klibc +Summary(pl.UTF-8): Biblioteki statyczne klibc Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static Static klibc libraries. -%description static -l pl +%description static -l pl.UTF-8 Biblioteki statyczne klibc. %package utils-shared Summary: Utilities dynamically linked with klibc -Summary(pl): Narzêdzia dynamicznie zlinkowane z klibc +Summary(pl.UTF-8): Narzędzia dynamicznie zlinkowane z klibc Group: Base Requires: %{name} = %{version}-%{release} %description utils-shared Utilities dynamically linked with klibc. -%description utils-shared -l pl -Narzêdzia dynamicznie zlinkowane z klibc. +%description utils-shared -l pl.UTF-8 +Narzędzia dynamicznie zlinkowane z klibc. + +%package utils-shared-debug +Summary: Utilities dynamically linked with klibc (unstripped) +Summary(pl.UTF-8): Narzędzia dynamicznie zlinkowane z klibc (z informacjami dla debuggera) +Group: Base +Requires: %{name}-utils-shared = %{version}-%{release} + +%description utils-shared-debug +Utilities dynamically linked with klibc. + +Programs in this package have debugging information not stripped. + +%description utils-shared-debug -l pl.UTF-8 +Narzędzia dynamicznie zlinkowane z klibc. + +Programy zawarte w tym pakiecie zawierają informacje dla debuggera. %package utils-static Summary: Utilities statically linked with klibc -Summary(pl): Narzêdzia statycznie zlinkowane z klibc +Summary(pl.UTF-8): Narzędzia statycznie zlinkowane z klibc Group: Base %description utils-static Utilities staticly linked with klibc. -%description utils-static -l pl -Narzêdzia statycznie zlinkowane z klibc. +%description utils-static -l pl.UTF-8 +Narzędzia statycznie zlinkowane z klibc. + +%package utils-static-debug +Summary: Utilities statically linked with klibc (unstripped) +Summary(pl.UTF-8): Narzędzia statycznie zlinkowane z klibc (z informacjami dla debuggera) +Group: Base +Requires: %{name}-utils-static = %{version}-%{release} + +%description utils-static-debug +Utilities staticly linked with klibc. + +Programs in this package have debugging information not stripped. + +%description utils-static-debug -l pl.UTF-8 +Narzędzia statycznie zlinkowane z klibc. + +Programy zawarte w tym pakiecie zawierają informacje dla debuggera. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -rm -rf include/{asm,asm-generic,linux} -%ifarch ppc powerpc -if [ -d %{_kernelsrcdir}/include/asm-powerpc ]; then - install -d include/asm - cp -a %{_kernelsrcdir}/include/asm-ppc/* include/asm/ - cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm/ -else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm -fi -%else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm -%endif -cd include -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 +cd usr/include +ln -sf /usr/include/asm . +ln -sf /usr/include/asm-generic . +%ifarch sparc64 +ln -sf /usr/include/asm-sparc . +ln -sf /usr/include/asm-sparc64 . %endif -for a in `ls arch`; do [ "$a" != "%{_target_base_arch}" ] && rm -rf arch/$a; done -cd .. +ln -sf /usr/include/linux . +# early-userspace needs acces to e.g. uvesafb.h. +ln -sf /usr/include/video . + +cd ../.. +install -d linux +ln -sf ../usr/include linux/include %{__make} \ ARCH=%{_target_base_arch} \ - CC="%{__cc}" \ + HOSTCC="%{__cc}" \ rpm_prefix=%{_prefix} \ rpm_bindir=%{_bindir} \ rpm_includedir=%{_includedir}/klibc \ rpm_libdir=%{_libdir} \ SHLIBDIR=/%{_lib} \ + %{?with_verbose:KBUILD_VERBOSE=1} \ OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=0 \ -falign-jumps=0 -falign-loops=0 -ffreestanding" @@ -129,22 +158,28 @@ install -d $RPM_BUILD_ROOT/%{_lib} install -d $RPM_BUILD_ROOT%{_includedir}/klibc install -d $RPM_BUILD_ROOT%{_libdir}/klibc/bin-{shared,static} -cp -a include/* $RPM_BUILD_ROOT%{_includedir}/klibc +cp -a usr/include/* $RPM_BUILD_ROOT%{_includedir}/klibc install klcc/klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc install klcc/klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1 -install klibc/libc.* klibc/arch/%{_target_base_arch}/crt0.o klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc -install klibc/klibc.so $RPM_BUILD_ROOT/%{_lib} -install dash/sh.shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh -install dash/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh -install utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared -install utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static +install usr/klibc/libc.* usr/klibc/arch/%{_target_base_arch}/crt0.o usr/klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc +install usr/klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib} +install usr/dash/sh.shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh +install usr/dash/sh.shared.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh.g +install usr/dash/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh +install usr/dash/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh.g +install usr/kinit/*/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared +install usr/kinit/*/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static +install usr/utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared +install usr/utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static + +ln -s %{_libdir}/klibc/bin-shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/klibc.so +%attr(755,root,root) /%{_lib}/klibc-*.so %files devel %defattr(644,root,root,755) @@ -161,10 +196,21 @@ rm -rf $RPM_BUILD_ROOT %files utils-shared %defattr(644,root,root,755) +%{_libdir}/klibc/bin %dir %{_libdir}/klibc/bin-shared %attr(755,root,root) %{_libdir}/klibc/bin-shared/* +%exclude %{_libdir}/klibc/bin-shared/*.g + +%files utils-shared-debug +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/klibc/bin-shared/*.g %files utils-static %defattr(644,root,root,755) %dir %{_libdir}/klibc/bin-static %attr(755,root,root) %{_libdir}/klibc/bin-static/* +%exclude %{_libdir}/klibc/bin-static/*.g + +%files utils-static-debug +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/klibc/bin-static/*.g