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

diff --git a/klibc.spec b/klibc.spec
index 4675d32..177fe84 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -3,16 +3,22 @@
 %bcond_without	dist_kernel	# build without distribution kernel-headers
 #
 Summary:	Minimalistic libc subset for use with initramfs
-Summary(pl):	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:	0.89
+Version:	1.4.34
 Release:	1
-License:	BSD
+License:	BSD/GPL
 Group:		Libraries
-Source0:	ftp://ftp.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	30ed2f7be1bf3327b531f8087c8ab9b6
+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
+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:	rpmbuild(macros) >= 1.153
 BuildRequires:	perl-base
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -24,37 +30,153 @@ initramfs. It is deliberately written for small size, minimal
 entaglement and portability, not speed. It is definitely a work in
 progress, and a lot of things are still missing.
 
-%description -l pl
-klibc w zamierzeniu ma byæ minimalistycznym podzbiorem biblioteki libc
-do u¿ycia z initramfs. Celem jest minimalizacja, przeno¶no¶æ ale nie
-szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal
+%description -l pl.UTF-8
+klibc w zamierzeniu ma być minimalistycznym podzbiorem biblioteki libc
+do użycia z initramfs. Celem jest minimalizacja, przenośność ale nie
+szybkość. klibc jest rozwijaną biblioteką w związku z czym nadal
 brakuje wielu rzeczy.
 
+%package devel
+Summary:	Development files for 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}
+
+%description devel
+Small libc for building embedded applications - development files.
+
+%description devel -l pl.UTF-8
+Mała libc do budowania aplikacji wbudowanych - pliki dla programistów.
+
+%package static
+Summary:	Static klibc libraries
+Summary(pl.UTF-8):	Biblioteki statyczne klibc
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static klibc libraries.
+
+%description static -l pl.UTF-8
+Biblioteki statyczne klibc.
+
+%package utils-shared
+Summary:	Utilities dynamically linked with klibc
+Summary(pl.UTF-8):	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.UTF-8
+Narzędzia dynamicznie zlinkowane z klibc.
+
+%package utils-static
+Summary:	Utilities statically linked with klibc
+Summary(pl.UTF-8):	Narzędzia statycznie zlinkowane z klibc
+Group:		Base
+
+%description utils-static
+Utilities staticly linked with klibc.
+
+%description utils-static -l pl.UTF-8
+Narzędzia statycznie zlinkowane z klibc.
+
 %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
+%endif
+for a in `ls arch`; do [ "$a" != "%{_target_base_arch}" ] && rm -rf arch/$a; done
+cd ../..
+
+%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
 
 %{__make} \
-	CC=%{__cc} \
+	ARCH=%{_target_base_arch} \
+	HOSTCC="%{__cc}" \
+	rpm_prefix=%{_prefix} \
+	rpm_bindir=%{_bindir} \
+	rpm_includedir=%{_includedir}/klibc \
+	rpm_libdir=%{_libdir} \
+	SHLIBDIR=/%{_lib} \
 	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 klibc/include/* $RPM_BUILD_ROOT%{_includedir}/klibc
-install klibc/libc.* klibc/crt0.o	$RPM_BUILD_ROOT%{_libdir}/klibc
+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/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
+install usr/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
+
+%files devel
+%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
+%{_libdir}/klibc/*.o
+%{_mandir}/man1/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/klibc/*.a
+
+%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/*