Author: qboosh                       Date: Sun Feb 20 01:38:29 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- recreated AC-branch from 2.3.4
  (NPTL and TLS disabled on ppc*/sparc*, no gcc4 patch)

---- Files affected:
SPECS:
   glibc.spec (1.579 -> 1.579.2.1) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.579 SPECS/glibc.spec:1.579.2.1
--- SPECS/glibc.spec:1.579      Sun Feb 20 02:17:30 2005
+++ SPECS/glibc.spec    Sun Feb 20 02:38:24 2005
@@ -42,7 +42,8 @@
 
 %if %{with tls}
 # sparc temporarily removed (broken)
-%ifnarch %{ix86} amd64 ia64 alpha s390 s390x sparc64 sparcv9 ppc ppc64
+%ifnarch %{ix86} amd64 ia64 alpha s390 s390x
+# sparc64 sparcv9 ppc ppc64  -- disabled in AC (gcc < 3.4)
 %undefine      with_tls
 %endif
 %endif
@@ -50,7 +51,8 @@
 %if %{with nptl}
 # on x86 uses cmpxchgl (available since i486)
 # on sparc only sparcv9 is supported
-%ifnarch i486 i586 i686 pentium3 pentium4 athlon amd64 ia64 alpha s390 s390x 
sparc64 sparcv9 ppc ppc64
+%ifnarch i486 i586 i686 pentium3 pentium4 athlon amd64 ia64 alpha s390 s390x
+# sparc64 sparcv9 ppc ppc64  -- disabled in AC (gcc < 3.4)
 %undefine      with_nptl
 %else
 %if %{without tls}
@@ -125,8 +127,7 @@
 Patch24:       %{name}-ZA_collate.patch
 Patch25:       %{name}-tls_fix.patch
 Patch26:       %{name}-nscd.patch
-Patch27:       %{name}-gcc4.patch
-Patch28:       %{name}-cross-gcc_eh.patch
+Patch27:       %{name}-cross-gcc_eh.patch
 # PaX hacks (dropped)
 #Patch29:      %{name}-pax_iconvconfig.patch
 #Patch30:      %{name}-pax_dl-execstack.patch
@@ -818,8 +819,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
-%{?with_cross:%patch28 -p1}
+%{?with_cross:%patch27 -p1}
 
 chmod +x scripts/cpp
 
@@ -1479,6 +1479,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.579.2.1  2005/02/20 01:38:24  qboosh
+- recreated AC-branch from 2.3.4
+  (NPTL and TLS disabled on ppc*/sparc*, no gcc4 patch)
+
 Revision 1.579  2005/02/20 01:17:30  qboosh
 - added nscd todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.579&r2=1.579.2.1&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to