X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=klibc.spec;h=4b8d8a138688d075935f36a03bdbc8322c5ab7af;hb=dcb240be17b94c88d89e79e1ab9d0f6f97c6f8f1;hp=2ab363e9eef4adc947081bad03cdf458aa2699f5;hpb=40e8e691f43b0ea2cafe4d21e0880188c7513ec0;p=packages%2Fklibc.git

diff --git a/klibc.spec b/klibc.spec
index 2ab363e..4b8d8a1 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -10,21 +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.21
+Version:	2.0.9
 Release:	1
 License:	BSD/GPL
 Group:		Libraries
-Source0:	http://www.kernel.org/pub/linux/libs/klibc/Current/%{name}-%{version}.tar.bz2
-# Source0-md5:	c232f3fd4e733f4d6ff8909fd54b9970
+Source0:	https://www.kernel.org/pub/linux/libs/klibc/2.0/%{name}-%{version}.tar.xz
+# Source0-md5:	7554a9759ae71e9ba3729991c8ae7f63
 Patch0:		%{name}-klcc.patch
-Patch1:		%{name}-make.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:	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
@@ -125,7 +129,7 @@ Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p2
 
 %build
 cd usr/include
@@ -146,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 \
@@ -166,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
@@ -191,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)