SPECS (DEVEL): uClibc.spec - up to new snapshot - put make options...

[sparky]

Author: sparky                       Date: Sun Nov  5 19:02:58 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to new snapshot
- put make options in one place
- builds with ccache

---- Files affected:
SPECS:
   uClibc.spec (1.121.2.13 -> 1.121.2.14) 

---- Diffs:

================================================================
Index: SPECS/uClibc.spec
diff -u SPECS/uClibc.spec:1.121.2.13 SPECS/uClibc.spec:1.121.2.14
--- SPECS/uClibc.spec:1.121.2.13	Tue Oct 17 16:14:17 2006
+++ SPECS/uClibc.spec	Sun Nov  5 20:02:53 2006
@@ -3,13 +3,13 @@
 Summary(pl):	Biblioteka C zoptymalizowana na rozmiar
 Name:		uClibc
 Version:	0.9.29
-%define		_snap	20060717
+%define		_snap	20061105
 Release:	0.%{_snap}.0.1
 Epoch:		2
 License:	LGPL
 Group:		Libraries
 Source0:	http://www.uclibc.org/downloads/snapshots/%{name}-%{_snap}.tar.bz2
-# Source0-md5:	68d6c7dba93714bc81e56ce0be8173f6
+# Source0-md5:	1e8a84ae049378224446f5ad476cc2d2
 Patch0:		%{name}-newsoname.patch
 Patch1:		%{name}-alpha.patch
 Patch2:		%{name}-toolchain-wrapper.patch
@@ -25,10 +25,16 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # note: the 2nd '\' is needed (some shell expansions?)
-%define		TARGET_ARCH	%(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/')
+%define		TARGET_ARCH	%(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/;s/sparc64/sparc/')
 
-# FIXME: build fails if CC contains spaces
-%undefine	with_ccache
+%define		MakeOpts	\\\
+	TARGET_ARCH="%{TARGET_ARCH}" \\\
+	TARGET_CPU="%{_target_cpu}" \\\
+	KERNEL_SOURCE="%{_prefix}" \\\
+	HOSTCC="%{__cc}" \\\
+	HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \\\
+	OPTIMIZATION="%{rpmcflags} -Os" \\\
+	CC="%{__cc}"
 
 %description
 Small libc for building embedded applications.
@@ -90,6 +96,10 @@
 	s/default TARGET_i386/default TARGET_x86_64/
 %endif
 	' extra/Configs/Config.in
+%ifarch sparc64
+sed -i -e 's/default CONFIG_SPARC_V8/default CONFIG_SPARC_V9B/' \
+	extra/Configs/Config.sparc
+%endif
 
 sed -i -e '/HAS_NO_THREADS/d' extra/Configs/Config.alpha
 
@@ -101,13 +111,7 @@
 
 %build
 %{__make} defconfig \
-	TARGET_ARCH="%{TARGET_ARCH}" \
-	TARGET_CPU="%{_target_cpu}" \
-	KERNEL_SOURCE=%{_prefix} \
-	HOSTCC=%{__cc} \
-	HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
-	OPTIMIZATION="%{rpmcflags} -Os" \
-	CC="%{__cc}"
+	%{MakeOpts}
 
 mv -f .config .config.tmp
 sed -e 's/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/;
@@ -125,24 +129,14 @@
 
 # note: defconfig and all must be run in separate make process because of macros
 %{__make} \
-	TARGET_ARCH="%{TARGET_ARCH}" \
-	TARGET_CPU="%{_target_cpu}" \
-	KERNEL_SOURCE=%{_prefix} \
-	HOSTCC=%{__cc} \
-	HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
-	OPTIMIZATION="%{rpmcflags} -Os" \
-	CC="%{__cc}"
+	%{MakeOpts}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
-	NATIVE_CC=%{__cc} \
-	NATIVE_CFLAGS="%{rpmcflags} %{rpmldflags}" \
-	TARGET_ARCH="%{TARGET_ARCH}" \
-	TARGET_CPU="%{_target_cpu}" \
-	CC="%{__cc}" \
+	%{MakeOpts} \
 	PREFIX=$RPM_BUILD_ROOT
 
 # these links are *needed* (by stuff in bin/)
@@ -204,6 +198,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121.2.14  2006/11/05 19:02:53  sparky
+- up to new snapshot
+- put make options in one place
+- builds with ccache
+
 Revision 1.121.2.13  2006/10/17 14:14:17  glen
 - disable ccache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.121.2.13&r2=1.121.2.14&f=u