X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=klibc.spec;h=e46e52c55a894ffe24c63a7d16a390b6bdd5e91b;hb=57d3a9c9da82414e2887364fd89cf12bee9dfec4;hp=42ecb280aac21b0c3a559922fc4194d3f10adfae;hpb=d925a6e68c017b8bcc0f2cb56cd89cf18f29ece2;p=packages%2Fklibc.git

diff --git a/klibc.spec b/klibc.spec
index 42ecb28..e46e52c 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -5,15 +5,19 @@
 Summary:	Minimalistic libc subset for use with initramfs
 Summary(pl):	Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs
 Name:		klibc
-Version:	0.110
+Version:	1.0.14
 Release:	1
-License:	BSD
+License:	BSD/GPL
 Group:		Libraries
-Source0:	ftp://ftp.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	c4ea6feb3f4c04e429a060d5f4e0c54a
+Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
+# Source0-md5:	882492395506ffb5f4cdbfca11eeb3d6
+Patch0:		%{name}-ksh-quotation.patch
+Patch1:		%{name}-klcc.patch
 URL:		http://www.zytor.com/mailman/listinfo/klibc/
 %{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4}
+BuildRequires:	rpmbuild(macros) >= 1.153
 BuildRequires:	perl-base
+%{?with_dist_kernel:Requires:	kernel-headers >= 2.4}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -30,31 +34,85 @@ do u
 szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal
 brakuje wielu rzeczy.
 
+%package utils-shared
+Summary:	Utilities dynamically linked with klibc
+Summary(pl):	Narzêdzia dynamicznie zlinkowane z klibc
+Group:		Base
+Requires:	%{name} = %{version}-%{release}
+
+%description utils-shared
+Utilities dynamically linked with klibc.
+
+%description utils-shared -l pl
+Narzêdzia dynamicznie zlinkowane z klibc.
+
+%package utils-static
+Summary:	Utilities statically linked with klibc
+Summary(pl):	Narzêdzia statycznie zlinkowane z klibc
+Group:		Base
+
+%description utils-static
+Utilities staticly linked with klibc.
+
+%description utils-static -l pl
+Narzêdzia statycznie zlinkowane z klibc.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-ln -s %{_kernelsrcdir} linux
+rm -rf include/{asm,asm-generic,linux}
+ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+ln -sf %{_kernelsrcdir}/include/asm-generic include/asm-generic
+cp -ar %{_kernelsrcdir}/include/linux include/linux
+ln -sf %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
 
 %{__make} \
+%if 0
+	ARCH=%{_target_base_arch} \
+	CROSS=%{_target_base_arch}-pld-linux- \
+%else
 	CC=%{__cc} \
+%endif
+	bindir=%{_bindir} \
+	includedir=%{_includedir}/klibc \
+	libdir=%{_libdir} \
+	prefix=%{_prefix} \
 	OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=0 \
-		-falign-jumps=0 -falign-loops=0"
+		-falign-jumps=0 -falign-loops=0 -ffreestanding"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/klibc
-install -d $RPM_BUILD_ROOT%{_libdir}/klibc
+install -d $RPM_BUILD_ROOT%{_libdir}/klibc/bin-{shared,static}
 
-cp -a klibc/include/* $RPM_BUILD_ROOT%{_includedir}/klibc
-install klibc/libc.* klibc/crt0.o	$RPM_BUILD_ROOT%{_libdir}/klibc
+cp -a include/* $RPM_BUILD_ROOT%{_includedir}/klibc
+install klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc
+install klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1
+install klibc/libc.* klibc/crt0.o klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc
+install utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
+install utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/klcc
+%{_includedir}/klibc
 %dir %{_libdir}/klibc
 %attr(755,root,root) %{_libdir}/klibc/*.so
 %{_libdir}/klibc/*.[ao]
-%{_includedir}/klibc
+%{_mandir}/man1/*
+
+%files utils-shared
+%defattr(644,root,root,755)
+%dir %{_libdir}/klibc/bin-shared
+%attr(755,root,root) %{_libdir}/klibc/bin-shared/*
+
+%files utils-static
+%defattr(644,root,root,755)
+%dir %{_libdir}/klibc/bin-static
+%attr(755,root,root) %{_libdir}/klibc/bin-static/*