SPECS: crossmipsel-uClibc.spec - finished

[kosmo]

Author: kosmo                        Date: Thu Mar 30 17:49:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finished

---- Files affected:
SPECS:
   crossmipsel-uClibc.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/crossmipsel-uClibc.spec
diff -u SPECS/crossmipsel-uClibc.spec:1.1 SPECS/crossmipsel-uClibc.spec:1.2
--- SPECS/crossmipsel-uClibc.spec:1.1	Sat Mar 11 09:05:06 2006
+++ SPECS/crossmipsel-uClibc.spec	Thu Mar 30 19:49:35 2006
@@ -1,11 +1,5 @@
 # $Revision$, $Date$
 #
-%bcond_with	bootstrap	# Build only headers
-#
-# TODO:
-#	- compile for m5307
-#	- add support for flat shared libraries (-mid-shared-library)
-#	- make less ugly ?
 
 %define		llh_version	2.4.31
 
@@ -23,7 +17,6 @@
 # Source1-md5:	997d36627baf6825c712431dee4d79d3
 Source2:	crossmipsel-uClibc.config
 URL:		http://www.uclibc.org/
-%{?!with_bootstrap:BuildRequires:	crossmipsel-gcc}
 BuildRequires:	sed >= 4.0
 BuildRequires:	which
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,7 +24,7 @@
 %define		target		mipsel-pld-linux
 %define		arch		%{_prefix}/%{target}
 
-%define         _noautostrip    .*%{arch}/lib/.*\\.[ao]$
+%define         _noautostrip    .*
 
 %description
 Small libc for building embedded applications.
@@ -43,56 +36,16 @@
 
 %prep
 %setup -q -n uClibc-%{version} -a1
-
 install %{SOURCE2} .config
-
 sed -i "s@^.*KERNEL_SOURCE.*\$@KERNEL_SOURCE=\"$PWD/linux-libc-headers-%{llh_version}\"@"	\
 	.config
 
-cd linux-libc-headers-%{llh_version}/include/asm-mips
-grep '#include[[:space:]]\+<asm-mipsel/.\+\.h>' * | cut -f1 -d: | while read file; do
-    cat "../asm-mipsel/$file" > "$file"
-done
-
 %build
-%if %{with bootstrap}
-    %{__make} headers < /dev/null
-%else
-    _build () {
-	local MULTILIB_SUBDIR=$1
-	local PIC_CODE=$2
-	local COMPILE_FLAGS=$3
-	
-	cat .config	| grep -v "HAVE_SHARED"		> .config.tmp
-	cat .config.tmp | grep -v "BUILD_UCLIBC_LDSO"	> .config
-	
-	if [ $PIC_CODE -ne 0 ]; then
-    	    sed -i 's/^.*DOPIC.*$/DOPIC=y/'		.config
-	    echo "HAVE_SHARED=n"		>>	.config
-	else
-    	    sed -i 's/^.*DOPIC.*$/# DOPIC is not set/'	.config
-	fi
-
-        %{__make} clean						|| exit 1
-        %{__make} all	ARCH_CFLAGS="$COMPILE_FLAGS" </dev/null	|| exit 1
-	
-	install -d		$RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR
-	install lib/*.[ao]	$RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR
-	%{target}-strip --strip-debug -R.comment -R.note	\
-				$RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR/*.[ao]
-    }
-
-    rm -rf $RPM_BUILD_ROOT
-    
-		_build	"mipsel"	0 "-Wall -march=mips32 -mtune=mips32  -nostdinc -mno-split-addresses"
-		_build	"mipsel"	1 "-Wall -march=mips32 -mtune=mips32  -nostdinc -mno-split-addresses"
-
-%endif
+%{__make}
 
 %install
-install -d		$RPM_BUILD_ROOT%{arch}/include
-cp -RL include/*	$RPM_BUILD_ROOT%{arch}/include
-ln -s include		$RPM_BUILD_ROOT%{arch}/sys-include
+rm -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,9 +53,11 @@
 %files
 %defattr(644,root,root,755)
 %doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt
+%dir %{arch}/lib
+%attr(755,root,root) %{arch}/lib/*.so
+%{arch}/lib/*.so.*
+%{arch}/lib/*.[ao]
 %{arch}/include
-%{arch}/lib
-%{arch}/sys-include
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -110,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/03/30 17:49:35  kosmo
+- finished
+
 Revision 1.1  2006/03/11 08:05:06  aredridel
 - added, NFY (doesn't build shared libs)
 
================================================================

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