SPECS: uClibc.spec - disable shared on x86_64 (not ready yet), add...

[qboosh]

Author: qboosh                       Date: Sun Aug 28 09:23:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disable shared on x86_64 (not ready yet), added x86_64 patch; builds now
- more docs (and base docs moved to base)

---- Files affected:
SPECS:
   uClibc.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: SPECS/uClibc.spec
diff -u SPECS/uClibc.spec:1.114 SPECS/uClibc.spec:1.115
--- SPECS/uClibc.spec:1.114	Sun Aug 28 10:33:15 2005
+++ SPECS/uClibc.spec	Sun Aug 28 11:23:31 2005
@@ -15,6 +15,7 @@
 Patch3:		%{name}-targetcpu.patch
 Patch4:		%{name}-O_DIRECT.patch
 Patch5:		%{name}-sparc.patch
+Patch6:		%{name}-x86_64.patch
 URL:		http://uclibc.org/
 BuildRequires:	gcc >= 3.0
 BuildRequires:	sed >= 4.0
@@ -23,7 +24,7 @@
 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/')
+%define		TARGET_ARCH	%(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/')
 
 %description
 Small libc for building embedded applications.
@@ -67,8 +68,9 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
-sed -e '
+sed -i -e '
 %ifarch sparc sparc64 sparcv9
 	s/default TARGET_i386/default TARGET_sparc/
 %endif
@@ -81,13 +83,12 @@
 %ifarch %{x8664}
 	s/default TARGET_i386/default TARGET_x86_64/
 %endif
-	' extra/Configs/Config.in > Conf.in.tmp
-mv -f Conf.in.tmp extra/Configs/Config.in
+	' extra/Configs/Config.in
 
-grep -v 'HAVE_NO_SHARED\|ARCH_HAS_NO_LDSO' extra/Configs/Config.sparc > C.tmp
-mv -f C.tmp extra/Configs/Config.sparc
-grep -v 'HAS_NO_THREADS' extra/Configs/Config.alpha > C.tmp
-mv -f C.tmp extra/Configs/Config.alpha
+# ldso on x86_64 not ready yet (missing resolve.S)
+sed -i -e '/HAS_NO_THREADS/a\\n\tselect HAVE_NO_SHARED\n\tselect ARCH_HAS_NO_LDSO' \
+	extra/Configs/Config.x86_64
+sed -i -e '/HAS_NO_THREADS/d' extra/Configs/Config.alpha
 
 %ifarch sparc sparc64 sparcv9
 ln -sf /usr/include/asm-sparc include/asm-sparc
@@ -164,22 +165,23 @@
 
 %files
 %defattr(644,root,root,755)
+%doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt
 %dir %{_prefix}/*-linux-uclibc
-%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664}
+%ifarch %{ix86} ppc sparc sparc64 sparcv9
 %dir %{_prefix}/*-linux-uclibc/lib
 %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so*
 %endif
 
 %files devel
 %defattr(644,root,root,755)
-%doc README TODO docs/threads.txt docs/uclibc.org/*.html
+%doc docs/uclibc.org/*
 %attr(755,root,root) %{_bindir}/*
 %{_prefix}/*-linux-uclibc/usr/lib/*.o
 %dir %{_prefix}/*-linux-uclibc/usr
 %dir %{_prefix}/*-linux-uclibc/usr/bin
 %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/*
 %dir %{_prefix}/*-linux-uclibc/usr/lib
-%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664}
+%ifarch %{ix86} ppc sparc sparc64 sparcv9
 %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so
 %endif
 %{_prefix}/*-linux-uclibc/usr/include
@@ -194,6 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2005/08/28 09:23:31  qboosh
+- disable shared on x86_64 (not ready yet), added x86_64 patch; builds now
+- more docs (and base docs moved to base)
+
 Revision 1.114  2005/08/28 08:33:15  qboosh
 - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again
 
================================================================

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