X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=klibc.spec;h=fbe4d7b8b93573d4f3f5149a0cd78cdf08141fa2;hb=4f949b8efe70b6d5d04714f30fd2186959a7bba2;hp=9fa15096a27ca99b81cdf3f7f32bda7da39182b1;hpb=43d4a56c22012448ab929a891096156b0f6295f2;p=packages%2Fklibc.git

diff --git a/klibc.spec b/klibc.spec
index 9fa1509..fbe4d7b 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,18 +1,28 @@
+#
+# Conditional build:
+%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¿ywa z initramfs
+Summary(pl):	Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs
 Name:		klibc
-Version:	0.81
+Version:	1.4.27
 Release:	1
-License:	BSD
+License:	BSD/GPL
 Group:		Libraries
-Source0:	ftp://ftp.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	22b7bf399748c541ad0a1fe681be6204
+Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
+# Source0-md5:	c26f737d559b8d1c4046fd3eaf8fa54b
+#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/
-BuildRequires:	kernel-source >= 2.4
-BuildRequires:	perl
+%{?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)
 
-%define no_install_post_strip 1
+%define		no_install_post_strip	1
 
 %description
 klibc, what is intended to be a minimalistic libc subset for use with
@@ -22,35 +32,151 @@ 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, przenaszalno¶æ ale
-nie szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal
+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):	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
+Ma³a libc do budowania aplikacji wbudowanych - pliki dla programistów.
+
+%package static
+Summary:	Static klibc libraries
+Summary(pl):	Biblioteki statyczne klibc
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static klibc libraries.
+
+%description static -l pl
+Biblioteki statyczne klibc.
+
+%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 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
-%{_libdir}/klibc/*.[ao]
 %attr(755,root,root) %{_libdir}/klibc/*.so
+%{_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/*