X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=94f803ec28326c13fc2a10ba4a7ebefad7190b7a;hp=297aa03309efb476e3bf7f22e56f5faecde684fc;hb=8d7c3cd9972811455a66197f944cab3cf6645a2a;hpb=a78269a3420bdfd9239ae055bffd0c9f3c85b468

diff --git a/klibc.spec b/klibc.spec
index 297aa03..94f803e 100644
--- 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,20 +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:	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:	db2152a8a03bd81e21a5f451f537ae3d
+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/
+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
@@ -76,17 +85,19 @@ 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
+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 debugging information not stripped.
+
+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ą informację dla debugera.
+
+Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
 
 %package utils-static
 Summary:	Utilities statically linked with klibc
@@ -95,28 +106,30 @@ Group:		Base
 
 %description utils-static
 Utilities staticly linked with klibc.
-Programs in this package debugging information not stripped.
 
 %description utils-static -l pl.UTF-8
 Narzędzia statycznie zlinkowane z klibc.
-Programy zawarte w tym pakiecie zawierają informację dla debugera.
 
 %package utils-static-debug
 Summary:	Utilities statically linked with klibc (unstripped)
-Summary(pl.UTF-8):	Narzędzia statycznie zlinkowane z klibc
+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
 cd usr/include
@@ -137,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 \
@@ -156,11 +171,12 @@ 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
@@ -173,7 +189,7 @@ 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)
@@ -182,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)