X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=klibc.spec;h=56938876c50f4bba24e484d130ee07e985da6eee;hb=0de29ff34d01a00ed44bc92773ac23190fbd37eb;hp=814a803ea62400d67642cd032ede87fd6b735edd;hpb=65ee0145bc5cb4ae910868af9d202486e9ad1f59;p=packages%2Fklibc.git

diff --git a/klibc.spec b/klibc.spec
index 814a803..5693887 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -5,19 +5,20 @@
 Summary:	Minimalistic libc subset for use with initramfs
 Summary(pl):	Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs
 Name:		klibc
-Version:	1.0
+Version:	1.1.16
 Release:	1
 License:	BSD/GPL
 Group:		Libraries
-Source0:	http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	daaa233fb7905cbe110896fcad9bec7f
-Patch0:		%{name}-ksh-quotation.patch
-Patch1:		%{name}-klcc.patch
+Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
+# Source0-md5:	80b85e84306695ed61049720008dd409
+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
-%{?with_dist_kernel:Requires:	kernel-headers >= 2.4}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -34,6 +35,32 @@ do u
 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
@@ -64,34 +91,51 @@ Narz
 
 %build
 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
+%ifarch ppc powerpc
+if [ -d %{_kernelsrcdir}/include/asm-powerpc ]; then
+	install -d include/asm
+	cp -a %{_kernelsrcdir}/include/asm-ppc/* include/asm/
+	cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm/
+else
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+fi
+%else
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
+cd 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 ..
 
 %{__make} \
-%if 0
 	ARCH=%{_target_base_arch} \
-	CROSS=%{_target_base_arch}-pld-linux- \
-%else
-	CC=%{__cc} \
-%endif
+	CC="%{__cc}" \
+	prefix=%{_prefix} \
 	bindir=%{_bindir} \
 	includedir=%{_includedir}/klibc \
-	libdir=%{_libdir}/klibc \
-	prefix=%{_prefix} \
+	libdir=%{_libdir} \
+	SHLIBDIR=/%{_lib} \
 	OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=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/bin-{shared,static}
 
 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 klcc/klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc
+install klcc/klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1
+install klibc/libc.* klibc/arch/%{_target_base_arch}/crt0.o klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc
+install klibc/klibc.so $RPM_BUILD_ROOT/%{_lib}
+install dash/sh.shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh
+install dash/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh
 install utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
 install utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 
@@ -100,13 +144,21 @@ 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]
+%{_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