Author: aurel32
Date: 2007-04-25 23:59:19 +0000 (Wed, 25 Apr 2007)
New Revision: 2137

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
   glibc-package/trunk/debian/sysdeps/hppa.mk
Log:
  * debian/control.in/main: drop build-depends on libssp32 and libssp64,
    build-depends on gcc-4.1 (>= 4.1.2-4) instead.  Closes: #413370.
  * debian/sysdeps/hppa.mk: switch back to gcc-4.1.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2007-04-25 22:39:39 UTC (rev 
2136)
+++ glibc-package/trunk/debian/changelog        2007-04-25 23:59:19 UTC (rev 
2137)
@@ -11,15 +11,18 @@
     #420755.
   * script.in/nohwcap.sh: use sed instead of awk.  Closes: #420799.
   * Update Catalan debconf translation, by Jordà Polo.  Closes: #420835.
-  * Add support for n32 and 64 ABIs on mips and mipsel, but keep it 
+  * Add support for n32 and 64 ABIs on mips and mipsel, but keep it
     disabled for now:
-    - control.in/main: add libc6-dev-mipsn32, libc6-dev-mips64 to the 
+    - control.in/main: add libc6-dev-mipsn32, libc6-dev-mips64 to the
       build-dependencies.
     - control.in/mips64: add libc6-mips64 and libc6-dev-mips64 packages.
     - control.in/mipsn32: add libc6-mipsn32 and libc6-dev-mipsn32 packages.
     - rules.d/control.mk: use control.in/mips64 and control.in/mipsn32.
     - sysdeps/mips.mk: add two new passes for n32 and 64 ABIs.
     - sysdeps/mipsel.mk: likewise.
+  * debian/control.in/main: drop build-depends on libssp32 and libssp64,
+    build-depends on gcc-4.1 (>= 4.1.2-4) instead.  Closes: #413370.
+  * debian/sysdeps/hppa.mk: switch back to gcc-4.1.
 
   [ Michael Banck ]
   * patches/hurd-i386/local-dl-dynamic-weak.diff: new patch (turn
@@ -32,7 +35,7 @@
      + also invalidate hosts on reload.
      + drop oldies (nscd_nischeck things, does not exists anymore).
 
- -- Pierre Habouzit <[EMAIL PROTECTED]>  Wed, 25 Apr 2007 22:27:06 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Thu, 26 Apr 2007 01:56:41 +0200
 
 glibc (2.5-4) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control  2007-04-25 22:39:39 UTC (rev 2136)
+++ glibc-package/trunk/debian/control  2007-04-25 23:59:19 UTC (rev 2137)
@@ -5,10 +5,9 @@
  linux-kernel-headers [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev 
[hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa],
+ gcc-4.0 [hurd-i386], gcc-4.1 [!hurd-i386] (>= 4.1.2-4)
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], 
libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], 
libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-mipsn32 [mips mipsel], 
libc6-dev-mips64 [mips mipsel], 
- lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
  quilt
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Build-Conflicts: gcc-4.1 (= 4.1.1-14)

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main  2007-04-25 22:39:39 UTC (rev 
2136)
+++ glibc-package/trunk/debian/control.in/main  2007-04-25 23:59:19 UTC (rev 
2137)
@@ -5,10 +5,9 @@
  linux-kernel-headers [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev 
[hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa],
+ gcc-4.0 [hurd-i386], gcc-4.1 [!hurd-i386] (>= 4.1.2-4)
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], 
libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], 
libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-mipsn32 [mips mipsel], 
libc6-dev-mips64 [mips mipsel], 
- lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
  quilt
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Build-Conflicts: gcc-4.1 (= 4.1.1-14)

Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk  2007-04-25 22:39:39 UTC (rev 
2136)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk  2007-04-25 23:59:19 UTC (rev 
2137)
@@ -5,10 +5,6 @@
 libc_add-ons = ports linuxthreads $(add-ons)
 libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
 
-# Build with gcc-4.2 to get TLS support
-CC = gcc-4.2
-BUILD_CC = gcc-4.2
-
 # We need LWS CAS support
 libc_MIN_KERNEL_SUPPORTED = 2.6.9
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to