r2320 - in glibc-package/trunk/debian: . sysdeps

[aurel32@alioth.debian.org]

Author: aurel32
Date: 2007-05-30 19:21:52 +0000 (Wed, 30 May 2007)
New Revision: 2320

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/sysdeps/depflags.mk
   glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
  * sysdeps/depflags.mk, sysdeps/depflags.pl: use DEB_HOST_ARCH_OS and
    DEB_HOST_ARCH instead of DEB_HOST_GNU_SYSTEM and DEB_HOST_GNU_TYPE


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-05-30 13:21:46 UTC (rev 2319)
+++ glibc-package/trunk/debian/changelog	2007-05-30 19:21:52 UTC (rev 2320)
@@ -9,6 +9,8 @@
   * debian/sysdeps/depflags.pl: depends on libgcc1/libgcc2/libgcc4.
   * any/cvs-nscd-short-replies.diff: new patch from CVS to fix crash on
     short replies.
+  * sysdeps/depflags.mk, sysdeps/depflags.pl: use DEB_HOST_ARCH_OS and
+    DEB_HOST_ARCH instead of DEB_HOST_GNU_SYSTEM and DEB_HOST_GNU_TYPE.
 
   [ Clint Adams ]
   * debian/local/manpages/ld.so.8: quote accepted values for LD_DEBUG.
@@ -16,7 +18,7 @@
   * New Malayalam debconf translation, by Sajeev പിആര്‍.  closes:
     #426203.
 
- -- Aurelien Jarno <aurel32@debian.org>  Wed, 30 May 2007 14:42:41 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 30 May 2007 21:18:38 +0200
 
 glibc (2.5-9) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/sysdeps/depflags.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.mk	2007-05-30 13:21:46 UTC (rev 2319)
+++ glibc-package/trunk/debian/sysdeps/depflags.mk	2007-05-30 19:21:52 UTC (rev 2320)
@@ -1,6 +1,6 @@
 depflags = libc=$(libc) glibc=glibc \
-	  DEB_HOST_GNU_SYSTEM=$(DEB_HOST_GNU_SYSTEM) \
-	  DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE) \
+	  DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS) \
+	  DEB_HOST_ARCH=$(DEB_HOST_ARCH) \
 	  perl debian/sysdeps/depflags.pl
 
 libc_control_flags = $(shell $(depflags) libc)

Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-30 13:21:46 UTC (rev 2319)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-30 19:21:52 UTC (rev 2320)
@@ -1,15 +1,15 @@
 #!/usr/bin/perl
 
 # These get export by debian/sysdeps/depflags.mk
-$DEB_HOST_GNU_SYSTEM = $ENV{'DEB_HOST_GNU_SYSTEM'};
-$DEB_HOST_GNU_TYPE = $ENV{'DEB_HOST_GNU_TYPE'};
+$DEB_HOST_ARCH_OS = $ENV{'DEB_HOST_ARCH_OS'};
+$DEB_HOST_ARCH = $ENV{'DEB_HOST_ARCH'};
 $libc = $ENV{'libc'};
 $glibc = $ENV{'glibc'};
 @deptypes = ('Depends', 'Replaces', 'Conflicts', 'Provides',
 	     'Suggests');
 
 # Let's make sure we are sane
-if (!defined($DEB_HOST_GNU_SYSTEM) or !defined($DEB_HOST_GNU_TYPE) or
+if (!defined($DEB_HOST_ARCH_OS) or !defined($DEB_HOST_ARCH) or
     !defined($libc) or !defined($glibc)) {
     die "Could not get all parameters";
 }
@@ -18,7 +18,7 @@
 $type = $ARGV[0];
 
 # OS specific stuff
-if ($DEB_HOST_GNU_SYSTEM eq "gnu") {
+if ($DEB_HOST_ARCH_OS eq "hurd") {
     push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev');
     push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
     push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
@@ -26,14 +26,14 @@
     push @{$libc_c{'Conflicts'}}, 'glibc2';
     push @{$libc_c{'Depends'}}, 'hurd (>= 20010718-1)';
 }
-if ($DEB_HOST_GNU_SYSTEM eq "linux-gnu") {
+if ($DEB_HOST_ARCH_OS eq "linux") {
     push @{$libc_c{'Suggests'}}, 'locales';
     push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
     push @{$libc_dev_c{'Replaces'}}, ('man-db (<= 2.3.10-41)', 'gettext (<= 0.10.26-1)',
 		'ppp (<= 2.2.0f-24)', 'libgdbmg1-dev (<= 1.7.3-24)');
     push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev | linux-kernel-headers';
 }
-if ($DEB_HOST_GNU_SYSTEM eq "kfreebsd-gnu") {
+if ($DEB_HOST_ARCH_OS eq "kfreebsd") {
     push @{$libc_c{'Suggests'}}, 'locales';
     push @{$libc_c{'Replaces'}}, 'libc0.1-dev (<< 2.3.2.ds1-14)';
     push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
@@ -55,7 +55,7 @@
 # 2.2.2+CVS requires a newer gcc. For non-i386, we just worry about the
 # weak-sym patch, since on i386 we need an even newer one because of the
 # pic-kludge that breaks libc_nonshared.a inclusion.
-if ($DEB_HOST_GNU_TYPE =~ m/^i486-linux-gnu$/) {
+if ($DEB_HOST_ARCH =~ m/^i386$/) {
     push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-9)';
 } else {
     push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-8)';
@@ -78,9 +78,9 @@
 push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007e-2)';
 
 # Depends on libgcc1/libgcc2/libgcc4
-if ($DEB_HOST_GNU_TYPE =~ m/^hppa-linux-gnu$/) {
+if ($DEB_HOST_ARCH =~ m/^hppa$/) {
     push @{$libc_c{'Depends'}}, 'libgcc4';
-} elsif ($DEB_HOST_GNU_TYPE =~ m/^m68k-linux-gnu$/) {
+} elsif ($DEB_HOST_ARCH =~ m/^m68k$/) {
     push @{$libc_c{'Depends'}}, 'libgcc2';
 } else {
     push @{$libc_c{'Depends'}}, 'libgcc1';