Fixing a minor display issue when we write out make.conf, adding HOSTUSE for amd64...

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

diff --git a/ChangeLog b/ChangeLog
index 09ee78592edb664f6729735294a7c40a89dc6bbc..2b25968854ddcfa297d1b6ca2f6177ee94f7948c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/amd64.py,
+  arch/x86.py, modules/generic_stage_target.py:
+  Fixing a minor display issue when we write out make.conf, adding HOSTUSE for
+  amd64 to add mmx, sse, and sse2 to USE, adding sse2 to pentium4's HOSTUSE.
+
   07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/kmerge.sh:
   Make the --kerncache option to genkernel dependent on 'kerncache' being in

diff --git a/arch/amd64.py b/arch/amd64.py
index 5cfa2eae0c19b14fd0889d1a2acb80f20753cd9b..2ede817ebf4f42fb5a7be3c9eeec49b7dcaddf40 100644 (file)
--- a/arch/amd64.py
+++ b/arch/amd64.py
@@ -13,6 +13,7 @@ class arch_amd64(generic_amd64):
                generic_amd64.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="x86_64-pc-linux-gnu"
+               self.settings["HOSTUSE"]=["mmx","sse","sse2"]
 
 #class arch_nocona(generic_x86):
 #      def __init__(self,myspec):

diff --git a/arch/x86.py b/arch/x86.py
index 6592f9ebdc0fc90fd37c73c24b34b3868f332b4b..23f7d190026eeeacd0b2c3e7dfea9ea2e8d892e5 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.py
@@ -81,7 +81,7 @@ class arch_pentium4(generic_x86):
        def __init__(self,myspec):
                arch_i686.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
-               self.settings["HOSTUSE"]=["mmx","sse"]
+               self.settings["HOSTUSE"]=["mmx","sse","sse2"]
 
 class arch_prescott(generic_x86):
        def __init__(self,myspec):
@@ -100,11 +100,10 @@ def register():
                "athlon"                : arch_athlon,
                "athlon-xp"             : arch_athlon_xp,
                "athlon-mp"             : arch_athlon_xp,
-               "pentium-mmx"           : arch_pentium_mmx,
+               "pentium-mmx"   : arch_pentium_mmx,
                "pentium2"              : arch_pentium2,
                "pentium3"              : arch_pentium3,
                "pentium4"              : arch_pentium4,
                "prescott"              : arch_prescott
-       },
-       ('i386', 'i486', 'i586', 'i686'))
+       }, ('i386', 'i486', 'i586', 'i686'))
 

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 03aeb0a1f6e1dec2ea0c381ab43c9eaa2f1f1803..a51abde4ebe4afa7aa308a44aae1f74530da1d32 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -908,7 +908,7 @@ class generic_stage_target(generic_target):
                        myf.write("# This should not be changed unless you know exactly what you are doing.  You\n# should probably be using a different stage, instead.\n")
                        if self.settings.has_key("CBUILD"):
                                myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
-                       myf.write('# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing it.\nCHOST="'+self.settings["CHOST"]+'"\n')
+                       myf.write('# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.\nCHOST="'+self.settings["CHOST"]+'"\n')
                    
                        # Figure out what our USE vars are for building
                        myusevars=[]