SPECS (AC-branch): gcc.spec - use x8664 macro - multilib update fo...

[qboosh]

Author: qboosh                       Date: Mon Nov 14 22:54:21 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use x8664 macro
- multilib update for ppc64/s390x/sparc64

---- Files affected:
SPECS:
   gcc.spec (1.241.2.21 -> 1.241.2.22) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.241.2.21 SPECS/gcc.spec:1.241.2.22
--- SPECS/gcc.spec:1.241.2.21	Fri Aug 19 17:40:12 2005
+++ SPECS/gcc.spec	Mon Nov 14 23:54:15 2005
@@ -5,13 +5,13 @@
 %bcond_without	java		# build without Java support
 %bcond_without	objc		# build without objc support
 %bcond_with	bootstrap	# don't BR gcc(ada) (temporary for Ac upgrade bootstrap)
-%ifarch amd64
+%ifarch %{x8664}
 %bcond_without	multilib	# build without multilib support
 %else
 %bcond_with	multilib	# build with multilib support
 %endif
 #
-%ifnarch amd64 ppc64 s390x sparc64
+%ifnarch %{x8664} ppc64 s390x sparc64
 %undefine	with_multilib
 %endif
 #
@@ -76,6 +76,15 @@
 %ifarch %{x8664}
 BuildRequires:	glibc-devel(i686)
 %endif
+%ifarch ppc64
+BuildRequires:	glibc-devel(ppc)
+%endif
+%ifarch s390x
+BuildRequires:	glibc-devel(s390)
+%endif
+%ifarch sparc64
+BuildRequires:	glibc-devel(sparc)
+%endif
 %endif
 BuildRequires:	perl-devel
 BuildRequires:	texinfo >= 4.1
@@ -90,7 +99,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_slibdir	/%{_lib}
-%ifarch amd64 ppc64 s390x sparc64
+%ifarch %{x8664} ppc64 s390x sparc64
 %define		_slibdir32	/lib
 %define		_libdir32	/usr/lib
 %endif
@@ -1851,6 +1860,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241.2.22  2005/11/14 22:54:15  qboosh
+- use x8664 macro
+- multilib update for ppc64/s390x/sparc64
+
 Revision 1.241.2.21  2005/08/19 15:40:12  baggins
 - don't force unconditional multilib on amd64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.241.2.21&r2=1.241.2.22&f=u