commit: d05808a7a8313a66a0be67e89867b4c3a1fe5ca0
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 9 16:32:27 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 9 16:32:27 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d05808a7
only set CHOST in make.conf if we are setting it via catalyst to override the
profile
this commit brings catalyst into compliance with the documentation which states
that
chost should be set if the user wants to override the profile
This also avoids the ugly warning in make.conf about how dangerous it is to
change
your chost
catalyst/arch/amd64.py | 7 -------
catalyst/arch/x86.py | 11 -----------
catalyst/base/stagebase.py | 5 +++--
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 1e11be9..463e8f5 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -12,7 +12,6 @@ class arch_amd64(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#lines like this appears to be trying to set the profile
default, better to use the profile
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
@@ -21,7 +20,6 @@ class arch_nocona(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=nocona -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
# Requires gcc 4.3 to use this class
@@ -30,7 +28,6 @@ class arch_core2(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=core2 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
class arch_k8(generic_amd64):
@@ -38,7 +35,6 @@ class arch_k8(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k8 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_k8_sse3(generic_amd64):
@@ -46,7 +42,6 @@ class arch_k8_sse3(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k8-sse3 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_amdfam10(generic_amd64):
@@ -54,7 +49,6 @@ class arch_amdfam10(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=amdfam10 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_x32(generic_amd64):
@@ -62,7 +56,6 @@ class arch_x32(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -pipe"
- self.settings["CHOST"]="x86_64-pc-linux-gnux32"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
def register():
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index f0c4a4c..44a6a49 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -50,14 +50,12 @@ class arch_i686(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=i686 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
class arch_pentium_mmx(generic_x86):
"Intel Pentium MMX CPU with MMX support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
class arch_pentium2(generic_x86):
@@ -65,7 +63,6 @@ class arch_pentium2(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium2 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
class arch_pentium3(generic_x86):
@@ -73,7 +70,6 @@ class arch_pentium3(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse"]}
class arch_pentium4(generic_x86):
@@ -81,7 +77,6 @@ class arch_pentium4(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
#lines like this appears to be trying to set the profile
default, better to use the profile
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
@@ -90,7 +85,6 @@ class arch_pentium_m(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium-m -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_prescott(generic_x86):
@@ -98,7 +92,6 @@ class arch_prescott(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=prescott -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_k6(generic_x86):
@@ -106,7 +99,6 @@ class arch_k6(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k6 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
class arch_k6_2(generic_x86):
@@ -114,7 +106,6 @@ class arch_k6_2(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k6-2 -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow"]}
class arch_athlon(generic_x86):
@@ -122,7 +113,6 @@ class arch_athlon(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=athlon -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow"]}
class arch_athlon_xp(generic_x86):
@@ -130,7 +120,6 @@ class arch_athlon_xp(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=athlon-xp -pipe"
- self.settings["CHOST"]="i686-pc-linux-gnu"
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow","sse"]}
def register():
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 60acd55..c6eaaa3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1119,8 +1119,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
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")
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.\n")
- myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
+ if "CHOST" in self.settings:
+ 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.\n")
+
myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
""" Figure out what our USE vars are for building """
myusevars=[]
