Dpkg::Arch: Add functions for direct debarch to/from gnutriplet conversion

diff --git a/ChangeLog b/ChangeLog
index adad184a58cbbfc076c20f87dfa96a115221cba2..9bb255cc84a76a8122e09a7f68624dbe1e44047c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-04  Guillem Jover  <guillem@debian.org>
+
+       * scripts/Dpkg/Arch.pm (debarch_to_gnutriplet): New function.
+       (gnutriplet_to_debarch): Likewise.
+       * scripts/dpkg-architecture.pl: Use debarch_to_gnutriplet and
+       gnutriplet_to_debarch instead of nested calls to
+       debtriplet_to_gnutriplet and debarch_to_debtriplet,
+       debtriplet_to_debarch and gnutriplet_to_debtriplet.
+
 2007-11-04  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-architecture.pl: Move setting of host and build arch

diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 7ffca35b4bd88c30b82f74733e9187fd184c8a85..547d6311fd073db1a70f8703bb51506dc2f70b35 100644 (file)
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -6,6 +6,7 @@ use warnings;
 use Exporter;
 our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(get_host_arch get_valid_arches debarch_eq debarch_is
+                    debarch_to_gnutriplet gnutriplet_to_debarch
                     debtriplet_to_gnutriplet gnutriplet_to_debtriplet
                     debtriplet_to_debarch debarch_to_debtriplet);
 
@@ -192,6 +193,20 @@ sub debarch_to_debtriplet($)
     }
 }
 
+sub debarch_to_gnutriplet($)
+{
+    my ($arch) = @_;
+
+    return debtriplet_to_gnutriplet(debarch_to_debtriplet($arch));
+}
+
+sub gnutriplet_to_debarch($)
+{
+    my ($gnu) = @_;
+
+    return debtriplet_to_debarch(gnutriplet_to_debtriplet($gnu));
+}
+
 sub debwildcard_to_debtriplet($)
 {
     local ($_) = @_;

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 3ea949940710a2c7216a8a38be8e2a0ded3b6b0b..ad9dd3d65620fd7d7240c2e040b9c74e61ba7d3c 100755 (executable)
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -27,7 +27,8 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning syserr usageerr);
 use Dpkg::Arch qw(get_valid_arches debarch_eq debarch_is
                   debtriplet_to_gnutriplet gnutriplet_to_debtriplet
-                  debtriplet_to_debarch debarch_to_debtriplet);
+                  debtriplet_to_debarch debarch_to_debtriplet
+                  debarch_to_gnutriplet gnutriplet_to_debarch);
 
 textdomain("dpkg-dev");
 
@@ -125,7 +126,7 @@ while (@ARGV) {
 
 chomp (my $deb_build_arch = `dpkg --print-architecture`);
 &syserr("dpkg --print-architecture failed") if $?>>8;
-my $deb_build_gnu_type = debtriplet_to_gnutriplet(debarch_to_debtriplet($deb_build_arch));
+my $deb_build_gnu_type = debarch_to_gnutriplet($deb_build_arch);
 
 # Default host: Current gcc.
 my $gcc = `\${CC:-gcc} -dumpmachine`;
@@ -157,17 +158,17 @@ if (!defined($deb_host_arch)) {
 }
 
 if ($req_host_arch ne '' && $req_host_gnu_type eq '') {
-    $req_host_gnu_type = debtriplet_to_gnutriplet(debarch_to_debtriplet($req_host_arch));
+    $req_host_gnu_type = debarch_to_gnutriplet($req_host_arch);
     die (sprintf(_g("unknown Debian architecture %s, you must specify GNU system type, too"), $req_host_arch)) unless defined $req_host_gnu_type;
 }
 
 if ($req_host_gnu_type ne '' && $req_host_arch eq '') {
-    $req_host_arch = debtriplet_to_debarch(gnutriplet_to_debtriplet($req_host_gnu_type));
+    $req_host_arch = gnutriplet_to_debarch($req_host_gnu_type);
     die (sprintf(_g("unknown GNU system type %s, you must specify Debian architecture, too"), $req_host_gnu_type)) unless defined $req_host_arch;
 }
 
 if ($req_host_gnu_type ne '' && $req_host_arch ne '') {
-    my $dfl_host_gnu_type = debtriplet_to_gnutriplet(debarch_to_debtriplet($req_host_arch));
+    my $dfl_host_gnu_type = debarch_to_gnutriplet($req_host_arch);
     die (sprintf(_g("unknown default GNU system type for Debian architecture %s"),
                  $req_host_arch))
        unless defined $dfl_host_gnu_type;