- updated klcc patch to use -idirafter for system includes

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index 51ad737f9672f7f702123b35582fea91605ff157..9ac694d34851f0e638e801e4175c587757f1c192 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,23 +1,23 @@
 #
 # Conditional build:
 %bcond_without dist_kernel     # build without distribution kernel-headers
+%bcond_with    verbose         # verbose build
 #
 Summary:       Minimalistic libc subset for use with initramfs
-Summary(pl.UTF-8):   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:       1.4.34
-Release:       1
+Version:       1.5
+Release:       2
 License:       BSD/GPL
 Group:         Libraries
-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
+Source0:       http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
+# Source0-md5: 481dfdef7273f2cc776c2637f481f017
 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: linux-libc-headers >= 7:2.6.20
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,11 +38,11 @@ brakuje wielu rzeczy.
 
 %package devel
 Summary:       Development files for klibc
-Summary(pl.UTF-8):   Pliki dla programistów 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}
+Requires:      linux-libc-headers >= 7:2.6.20
 
 %description devel
 Small libc for building embedded applications - development files.
@@ -52,7 +52,7 @@ Mała libc do budowania aplikacji wbudowanych - pliki dla programistów.
 
 %package static
 Summary:       Static klibc libraries
-Summary(pl.UTF-8):   Biblioteki statyczne klibc
+Summary(pl.UTF-8):     Biblioteki statyczne klibc
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -64,7 +64,7 @@ Biblioteki statyczne klibc.
 
 %package utils-shared
 Summary:       Utilities dynamically linked with klibc
-Summary(pl.UTF-8):   Narzędzia dynamicznie zlinkowane z klibc
+Summary(pl.UTF-8):     Narzędzia dynamicznie zlinkowane z klibc
 Group:         Base
 Requires:      %{name} = %{version}-%{release}
 
@@ -76,7 +76,7 @@ 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
+Summary(pl.UTF-8):     Narzędzia statycznie zlinkowane z klibc
 Group:         Base
 
 %description utils-static
@@ -91,35 +91,23 @@ Narzędzia statycznie zlinkowane z klibc.
 %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
+ln -sf /usr/include/linux .
+ln -sf /usr/include/asm .
+ln -sf /usr/include/asm-generic .
+%ifarch %{x8664}
+ln -sf /usr/include/asm-i386 .
+ln -sf /usr/include/asm-x86_64 .
 %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 )
+%ifarch sparc64
+ln -sf /usr/include/asm-sparc .
+ln -sf /usr/include/asm-sparc64 .
 %endif
 
+cd ../..
+install -d linux
+ln -sf ../usr/include linux/include
+
 %{__make} \
        ARCH=%{_target_base_arch} \
        HOSTCC="%{__cc}" \
@@ -128,6 +116,7 @@ cd ../..
        rpm_includedir=%{_includedir}/klibc \
        rpm_libdir=%{_libdir} \
        SHLIBDIR=/%{_lib} \
+       %{?with_verbose:KBUILD_VERBOSE=1} \
        OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=0 \
                -falign-jumps=0 -falign-loops=0 -ffreestanding"