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

diff --git a/klibc.spec b/klibc.spec
index 51ad737..297aa03 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,23 +1,23 @@
 #
 # 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
+Summary(pl.UTF-8):	Zminimalizowany podzbiór biblioteki C do używania z initramfs
 Name:		klibc
-Version:	1.4.34
-Release:	1
+Version:	1.5.15
+Release:	2
 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-md5:	db2152a8a03bd81e21a5f451f537ae3d
 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)
@@ -38,11 +38,11 @@ brakuje wielu rzeczy.
 
 %package devel
 Summary:	Development files for klibc
-Summary(pl.UTF-8):   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.
@@ -52,7 +52,7 @@ Mała libc do budowania aplikacji wbudowanych - pliki dla programistów.
 
 %package static
 Summary:	Static klibc libraries
-Summary(pl.UTF-8):   Biblioteki statyczne klibc
+Summary(pl.UTF-8):	Biblioteki statyczne klibc
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -64,7 +64,7 @@ Biblioteki statyczne klibc.
 
 %package utils-shared
 Summary:	Utilities dynamically linked with klibc
-Summary(pl.UTF-8):   Narzędzia dynamicznie zlinkowane z klibc
+Summary(pl.UTF-8):	Narzędzia dynamicznie zlinkowane z klibc
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
 
@@ -74,16 +74,44 @@ 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
+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.
+
+%description utils-shared-debug -l pl.UTF-8
+Narzędzia dynamicznie zlinkowane z klibc.
+Programy zawarte w tym pakiecie zawierają informację dla debugera.
+
 %package utils-static
 Summary:	Utilities statically linked with klibc
-Summary(pl.UTF-8):   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.
+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
+Group:		Base
+Requires:	%{name}-utils-static = %{version}-%{release}
+
+%description utils-static-debug
+Utilities staticly linked with klibc.
+
+%description utils-static-debug -l pl.UTF-8
+Narzędzia statycznie zlinkowane z klibc.
 
 %prep
 %setup -q
@@ -91,34 +119,20 @@ Narzędzia statycznie zlinkowane z klibc.
 %patch1 -p1
 
 %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-up.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} \
@@ -128,6 +142,7 @@ cd ../..
 	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"
 
@@ -151,6 +166,8 @@ 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
 
@@ -173,10 +190,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