X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=d0a33c26b830d0f6d98690a6ff280eb2cc1d6d99;hp=658ae3971624e48adc6e84aeb1dd9274238ca56d;hb=5b98d45ce1a9fe36c474b7b78abd0ca98300b58f;hpb=005953dc74451f67d99accd469fe6c2912f996a9

diff --git a/klibc.spec b/klibc.spec
index 658ae39..d0a33c2 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -3,17 +3,21 @@
 %bcond_without	dist_kernel	# build without distribution kernel-headers
 #
 Summary:	Minimalistic libc subset for use with initramfs
-Summary(pl):	Zminimalizowany podzbiór bibliteki C do u¿ywania z initramfs
+Summary(pl):	Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs
 Name:		klibc
-Version:	0.87
-Release:	1
-License:	BSD
+Version:	1.1.1
+Release:	0.1
+License:	BSD/GPL
 Group:		Libraries
-Source0:	ftp://ftp.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	51e93c1a42fe432c0eb5e98f5374ac6e
+Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
+# Source0-md5:	baa1f6e0b6acbf9576bb28cca5c32c89
+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,89 @@ 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
+cd include
+rm -rf asm asm-generic linux
+cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch} .
+ln -sf asm-%{_target_base_arch} asm
+cp -a %{_kernelsrcdir}/include/asm-generic .
+cp -a %{_kernelsrcdir}/include/linux .
+%{?with_dist_kernel:cp -a %{_kernelsrcdir}/include/linux/autoconf-up.h linux/autoconf.h}
+cd ..
 
 %{__make} \
-	CC=%{__cc} \
+	ARCH=%{_target_base_arch} \
+	CC="%{__cc}" \
+	prefix=%{_prefix} \
+	bindir=%{_bindir} \
+	includedir=%{_includedir}/klibc \
+	libdir=%{_libdir} \
 	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/%{_lib}
 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 include/* $RPM_BUILD_ROOT%{_includedir}/klibc
 
-cp -a klibc/include/* $RPM_BUILD_ROOT%{_includedir}/klibc
-install klibc/libc.* klibc/crt0.o	$RPM_BUILD_ROOT%{_libdir}/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 klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib}
+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) /%{_lib}/klibc*.so
+%attr(755,root,root) %{_bindir}/klcc
+%{_includedir}/klibc
 %dir %{_libdir}/klibc
 %attr(755,root,root) %{_libdir}/klibc/*.so
+%{_libdir}/klibc/*.so.hash
 %{_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/*