Rearrange things in the arch/*.py files to ensure that nothing is used before it...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1285 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 7e90adb8263bd3d2fd606789481c84ea895cccf6..351fa853a21237cb9eafc423e928b44879d646cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  07 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/amd64.py,
+  arch/mips.py:
+  Rearrange things in the arch/*.py files to ensure that nothing is used
+  before it has been defined.
+
   07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> arch/powerpc.py:
   Reorder arch/powerpc.py to make python happy
 

diff --git a/arch/amd64.py b/arch/amd64.py
index a62b97519c149ce242f4a0b4086bd8f2fce4b466..5cfa2eae0c19b14fd0889d1a2acb80f20753cd9b 100644 (file)
--- a/arch/amd64.py
+++ b/arch/amd64.py
@@ -28,5 +28,7 @@ class arch_amd64(generic_amd64):
 
 def register():
        "Inform main catalyst program of the contents of this plugin."
-       return ({"amd64":arch_amd64}, ("x86_64", ))
+       return ({
+               "amd64"         : arch_amd64
+       }, ("x86_64", ))
 

diff --git a/arch/mips.py b/arch/mips.py
index bca6351e8d156d18b2d6eea3354a77a342ae6276..5239fae6873fb33e8ee46349b62f9ab866579b5a 100644 (file)
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -16,56 +16,6 @@ class generic_mipsel(builder.generic):
                self.settings["CHROOT"]="chroot"
                self.settings["CHOST"]="mipsel-unknown-linux-gnu"
 
-class arch_cobalt(generic_mipsel):
-       "Builder class for all cobalt [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=32 -pipe"
-               self.settings["CHOST"]="mipsel-unknown-linux-gnu"
-               self.settings["HOSTUSE"]=["cobalt"]
-
-class arch_cobalt_n32(generic_mipsel):
-       "Builder class for all cobalt [Little-endian N32]"
-       def __init__(self,myspec):
-               arch_cobalt.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
-               self.settings["HOSTUSE"]=["cobalt","n32"]
-
-class arch_ip27(generic_mipsel):
-       "Builder class for all IP27 [Big-endian]"
-       def __init__(self,myspec):
-               arch_mips4.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip27"]
-
-class arch_ip27_n32(generic_mipsel):
-       "Builder class for all IP27 [Big-endian N32]"
-       def __init__(self,myspec):
-               arch_mips4_n32.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip27","n32"]
-
-class arch_ip28(generic_mipsel):
-       "Builder class for all IP28 [Big-endian]"
-       def __init__(self,myspec):
-               arch_mips4.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip28"]
-
-class arch_ip28_n32(generic_mipsel):
-       "Builder class for all IP28 [Big-endian N32]"
-       def __init__(self,myspec):
-               arch_mips4_n32.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip28","n32"]
-
-class arch_ip30(generic_mipsel):
-       "Builder class for all IP30 [Big-endian]"
-       def __init__(self,myspec):
-               arch_mips4.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip30"]
-
-class arch_ip30_n32(generic_mipsel):
-       "Builder class for all IP30 [Big-endian N32]"
-       def __init__(self,myspec):
-               arch_mips4_n32.__init__(self,myspec)
-               self.settings["HOSTUSE"]=["ip30","n32"]
 class arch_mips1(generic_mips):
        "Builder class for MIPS I [Big-endian]"
        def __init__(self,myspec):
@@ -162,22 +112,56 @@ class arch_mipsel4_n32(generic_mipsel):
                self.settings["CHOST"]="mips64el-unknown-linux-gnu"
                self.settings["HOSTUSE"]=["n32"]
 
+class arch_cobalt(generic_mipsel):
+       "Builder class for all cobalt [Little-endian]"
+       def __init__(self,myspec):
+               generic_mipsel.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=32 -pipe"
+               self.settings["CHOST"]="mipsel-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["cobalt"]
 
+class arch_cobalt_n32(generic_mipsel):
+       "Builder class for all cobalt [Little-endian N32]"
+       def __init__(self,myspec):
+               arch_cobalt.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
+               self.settings["HOSTUSE"]=["cobalt","n32"]
 
+class arch_ip27(generic_mipsel):
+       "Builder class for all IP27 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip27"]
 
+class arch_ip27_n32(generic_mipsel):
+       "Builder class for all IP27 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip27","n32"]
 
+class arch_ip28(generic_mipsel):
+       "Builder class for all IP28 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip28"]
 
+class arch_ip28_n32(generic_mipsel):
+       "Builder class for all IP28 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip28","n32"]
 
+class arch_ip30(generic_mipsel):
+       "Builder class for all IP30 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip30"]
 
-
-
-
-
-
-
-
-
-
+class arch_ip30_n32(generic_mipsel):
+       "Builder class for all IP30 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip30","n32"]
 
 def register():
        "Inform main catalyst program of the contents of this plugin."