X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=94f803ec28326c13fc2a10ba4a7ebefad7190b7a;hp=48605acd0f9cd70c95ad3a98724fad0a9fdb6231;hb=8d7c3cd9972811455a66197f944cab3cf6645a2a;hpb=565e8b49d8271602a0296ce3f7f13be9339ebefa diff --git a/klibc.spec b/klibc.spec index 48605ac..94f803e 100644 --- a/klibc.spec +++ b/klibc.spec @@ -1,25 +1,34 @@ # +# 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.UTF-8): Zminimalizowany podzbiór biblioteki C do używania z initramfs Name: klibc -Version: 1.4.34 -Release: 2 +Version: 2.0.8 +Release: 1 License: BSD/GPL Group: Libraries -Source0: http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2 -# Source0-md5: f503f328cc612d4ab523919692814804 -#Source0: http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2 +Source0: https://www.kernel.org/pub/linux/libs/klibc/2.0/%{name}-%{version}.tar.xz +# Source0-md5: bdd05bf16fce534e7a49d98644cdec87 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} +Patch1: aligned_u64.patch +URL: https://lists.zytor.com/klibc/ +# ld.bfd binary +BuildRequires: binutils >= 2.20.51.0.6 BuildRequires: bison BuildRequires: flex -BuildRequires: rpmbuild(macros) >= 1.153 +BuildRequires: linux-libc-headers >= 7:2.6.24-1 BuildRequires: perl-base +BuildRequires: perl-modules +BuildRequires: rpmbuild(macros) >= 1.153 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define no_install_post_strip 1 @@ -42,7 +51,7 @@ 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. @@ -74,6 +83,22 @@ Utilities dynamically linked with 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.UTF-8): Narzędzia statycznie zlinkowane z klibc @@ -85,49 +110,54 @@ Utilities staticly linked with 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 +%patch1 -p2 %build -ln -s %{_kernelsrcdir} linux -rm -rf usr/include/{asm,asm-generic,linux} -%ifarch ppc powerpc -if [ -d %{_kernelsrcdir}/include/asm-powerpc ]; then - install -d usr/include/asm - cp -a %{_kernelsrcdir}/include/asm-ppc/* usr/include/asm/ - cp -a %{_kernelsrcdir}/include/asm-powerpc/* usr/include/asm/ -else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} usr/include/asm -fi -%else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} usr/include/asm -%endif cd usr/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.h arch/%{_target_base_arch}/linux/autoconf.h +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 . -%ifarch sparc -# hack; missing dependency in make system -( cd usr/klibc && %{__make} -f arch/sparc/Makefile.inc ARCH=sparc \ - arch/sparc/sdiv.S arch/sparc/udiv.S arch/sparc/srem.S arch/sparc/urem.S ) -%endif +cd ../.. +install -d linux +ln -sf ../usr/include linux/include %{__make} \ ARCH=%{_target_base_arch} \ HOSTCC="%{__cc}" \ + CC="%{__cc}" \ + LD="ld.bfd" \ 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" @@ -141,22 +171,25 @@ 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 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/klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib} +install usr/dash/shared/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared +install usr/dash/shared/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared +install usr/dash/static/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static +install usr/dash/static/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static +install usr/gzip/{gunzip,gzip,gzip.g,zcat} $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static 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) @@ -165,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/klibc %attr(755,root,root) %{_libdir}/klibc/*.so %{_libdir}/klibc/*.o -%{_mandir}/man1/* +%{_mandir}/man1/klcc.1* %files static %defattr(644,root,root,755) @@ -173,10 +206,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