- hack for sparc + correct cc usage

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index 8086bbeeed50adbce00db177529c04fe066f1c31..2d0dfc6047d4078190a788685a677bed6ffb5690 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,25 +1,22 @@
 #
-# TODO:
-#      -       fix klibc loader crash:
-#              http://www.zytor.com/pipermail/klibc/2005-September/001150.html
-#
 # Conditional build:
 %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
 Name:          klibc
-Version:       1.1.1
+Version:       1.1.16
 Release:       1
 License:       BSD/GPL
 Group:         Libraries
 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
-Patch2:                %{name}-fstype_jfs.patch
+# 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +39,7 @@ brakuje wielu rzeczy.
 Summary:       Development files for klibc
 Summary(pl):   Pliki dla programistów klibc
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      binutils
 %{?with_dist_kernel:Requires:  kernel-headers >= 2.4}
 
@@ -56,7 +53,7 @@ Ma
 Summary:       Static klibc libraries
 Summary(pl):   Biblioteki statyczne klibc
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static klibc libraries.
@@ -91,13 +88,21 @@ Narz
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 %build
+rm -rf include/{asm,asm-generic,linux}
+%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
-rm -rf asm asm-generic linux
-ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} .
-ln -sf asm-%{_target_base_arch} asm
 ln -sf %{_kernelsrcdir}/include/asm-generic .
 ln -sf %{_kernelsrcdir}/include/linux .
 %if %{with dist_kernel}
@@ -107,13 +112,20 @@ ln -sf  %{_kernelsrcdir}/include/linux/autoconf-up.h arch/%{_target_base_arch}/l
 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 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} \
        ARCH=%{_target_base_arch} \
-       CC="%{__cc}" \
-       prefix=%{_prefix} \
-       bindir=%{_bindir} \
-       includedir=%{_includedir}/klibc \
-       libdir=%{_libdir} \
+       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 -ffreestanding"
 
@@ -124,10 +136,12 @@ 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 klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib}
+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
 
@@ -136,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/klibc*.so
+%attr(755,root,root) /%{_lib}/klibc.so
 
 %files devel
 %defattr(644,root,root,755)