X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=d2d3af0f340cb9388b2fc4b9690bb54d3bb97ff9;hp=177fe84ea742b424cf11f42d8f34b8ba0ead0bc4;hb=56e06937f2f903ff7f2884eed1c88d9d531c57c4;hpb=8690a6c007504f3a98e1df893477d964d090476b

diff --git a/klibc.spec b/klibc.spec
index 177fe84..d2d3af0 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,25 +1,32 @@
 #
+# 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
+Version:	1.5.23
 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:	http://www.kernel.org/pub/linux/libs/klibc/Current/%{name}-%{version}.tar.bz2
+# Source0-md5:	38a0ac99c4facd14443f4495b29aeff1
 Patch0:		%{name}-klcc.patch
-Patch1:		%{name}-kill_interp_sohash.patch
+Patch1:		%{name}-make.patch
 URL:		http://www.zytor.com/mailman/listinfo/klibc/
-%{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4}
+# 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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -42,7 +49,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 +81,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 +108,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
 
 %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} \
 	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,7 +169,7 @@ 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/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
@@ -151,12 +179,14 @@ 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 +195,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 +203,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