- updated to 2.0.8

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index caf7d6c83546411199597911b6c01a4c8125962d..94f803ec28326c13fc2a10ba4a7ebefad7190b7a 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,4 +1,8 @@
 #
+# 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
@@ -6,19 +10,25 @@
 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.5.15
-Release:       3
+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: db2152a8a03bd81e21a5f451f537ae3d
+Source0:       https://www.kernel.org/pub/linux/libs/klibc/2.0/%{name}-%{version}.tar.xz
+# Source0-md5: bdd05bf16fce534e7a49d98644cdec87
 Patch0:                %{name}-klcc.patch
-URL:           http://www.zytor.com/mailman/listinfo/klibc/
+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: linux-libc-headers >= 7:2.6.24-1
-BuildRequires: rpmbuild(macros) >= 1.153
 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
@@ -119,6 +129,7 @@ Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p2
 
 %build
 cd usr/include
@@ -139,6 +150,8 @@ 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 \
@@ -159,10 +172,11 @@ 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/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
@@ -184,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)