[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/arch/
commit: 14a5425fdf918f7299706196a32ee3e722315376
Author: Ben Kohler gentoo org>
AuthorDate: Wed Sep 19 15:42:11 2018 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed Sep 19 15:53:12 2018 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=14a5425f
First implementation of COMMON_FLAGS for make.conf
This introduces a new variable COMMON_FLAGS for make.conf. In catalyst,
individual arches' arch/${arch}.py files will set COMMON_FLAGS and this
will be expanded to set default values for otherwise unset {C,CXX,F,FC}FLAGS.
Eg:
COMMON_FLAGS="-O2 -pipe"
CFLAGS="${COMMON_FLAGS}"
CXXFLAGS="${COMMON_FLAGS}"
FCFLAGS="${COMMON_FLAGS}"
FFLAGS="${COMMON_FLAGS}"
Individual (sub)arches can choose to set specific values for those other
*FLAGS and then they will not be set to ${COMMON_FLAGS}.
Implementation thanks to dwfreed. Should resolve the following bugs:
https://bugs.gentoo.org/575446
https://bugs.gentoo.org/665758
https://bugs.gentoo.org/654080
catalyst/arch/alpha.py | 18 +++
catalyst/arch/amd64.py | 14 ++---
catalyst/arch/arm.py | 28 +-
catalyst/arch/arm64.py | 3 +-
catalyst/arch/hppa.py | 9 ++--
catalyst/arch/ia64.py | 3 +-
catalyst/arch/m68k.py | 4 +-
catalyst/arch/mips.py | 132 ++---
catalyst/arch/powerpc.py | 36 ++---
catalyst/arch/s390.py | 4 +-
catalyst/arch/sh.py| 24 -
catalyst/arch/sparc.py | 4 +-
catalyst/arch/x86.py | 30 +--
catalyst/base/stagebase.py | 14 ++---
14 files changed, 160 insertions(+), 163 deletions(-)
diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index a4e7cafa..813b0020 100644
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -7,55 +7,55 @@ class generic_alpha(builder.generic):
"abstract base class for all alpha builders"
def __init__(self,myspec):
builder.generic.__init__(self,myspec)
- self.settings["CFLAGS"]="-mieee -pipe"
+ self.settings["COMMON_FLAGS"]="-mieee -pipe"
class arch_alpha(generic_alpha):
"builder class for generic alpha (ev4+)"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev4"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev4"
self.settings["CHOST"]="alpha-unknown-linux-gnu"
class arch_ev4(generic_alpha):
"builder class for alpha ev4"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev4"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev4"
self.settings["CHOST"]="alphaev4-unknown-linux-gnu"
class arch_ev45(generic_alpha):
"builder class for alpha ev45"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev45"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev45"
self.settings["CHOST"]="alphaev45-unknown-linux-gnu"
class arch_ev5(generic_alpha):
"builder class for alpha ev5"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev5"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev5"
self.settings["CHOST"]="alphaev5-unknown-linux-gnu"
class arch_ev56(generic_alpha):
"builder class for alpha ev56 (ev5 plus BWX)"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev56"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev56"
self.settings["CHOST"]="alphaev56-unknown-linux-gnu"
class arch_pca56(generic_alpha):
"builder class for alpha pca56 (ev5 plus BWX & MAX)"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=pca56"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=pca56"
self.settings["CHOST"]="alphaev56-unknown-linux-gnu"
class arch_ev6(generic_alpha):
"builder class for alpha ev6"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev6"
+ self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev6"
self.settings["CHOST"]="alphaev6-unknown-linux-gnu"
self.settings["HOSTUSE"]=["ev6"]
@@ -63,7 +63,7 @@ class arch_ev67(generic_alpha):
"builder class for alpha ev67 (ev6 plus CIX)"
def __init__(self,myspec):
generic_alpha.__init__(self,myspec)
- self.settings["CFLAGS"]+=" -O2 -mcpu=ev67"
+ self.settings["COMMON_FLAGS"]+=" -O2
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/arch/, catalyst/targets/
commit: 68c5ace05cfddab5185c78e79d5c48cb30677fca
Author: Mike Frysinger gentoo org>
AuthorDate: Tue Oct 6 13:54:45 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Oct 6 13:54:45 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=68c5ace0
lint: fix bad indentation
Fix code that has excessive indentation relative to previous levels.
catalyst/arch/x86.py | 4 ++--
catalyst/base/stagebase.py| 6 +++---
catalyst/targets/livecd_stage1.py | 2 +-
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/netboot2.py | 4 ++--
catalyst/targets/stage2.py| 12 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 49500b9..33b29c0 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -10,8 +10,8 @@ class generic_x86(builder.generic):
builder.generic.__init__(self,myspec)
if self.settings["buildarch"]=="amd64":
if not os.path.exists("/bin/linux32") and not
os.path.exists("/usr/bin/linux32"):
- raise CatalystError("required
executable linux32 not found "
- "(\"emerge setarch\" to fix.)",
print_traceback=True)
+ raise CatalystError("required executable
linux32 not found "
+ "(\"emerge setarch\" to fix.)",
print_traceback=True)
self.settings["CHROOT"]="linux32 chroot"
self.settings["crosscompile"] = False
else:
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a9e7848..b9dd1d5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -853,9 +853,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
and os.path.exists(target_portdir) \
and self.resume.is_enabled("unpack_portage") \
and self.settings["snapshot_path_hash"] ==
snapshot_hash:
- print \
- "Valid Resume point detected,
skipping unpack of portage tree..."
- unpack=False
+ print \
+ "Valid Resume point detected, skipping
unpack of portage tree..."
+ unpack = False
if unpack:
if "snapcache" in self.settings["options"]:
diff --git a/catalyst/targets/livecd_stage1.py
b/catalyst/targets/livecd_stage1.py
index ff320c0..262db70 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target
path setup operation..."
+ print "Resume point detected, skipping target path
setup operation..."
else:
# first clean up any existing target stuff
if os.path.exists(self.settings["target_path"]):
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index 870dcf9..b54f2f0 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -55,7 +55,7 @@ class livecd_stage2(StageBase):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target
path setup operation..."
+ print "Resume point detected, skipping target path
setup operation..."
else:
# first clean up any existing target stuff
if os.path.isdir(self.settings["target_path"]):
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index e509cf9..f2d039c 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -54,7 +54,7 @@ class netboot2(StageBase):
self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target
path setup operation..."
+ print "Resume point detected, skipping target path
setup
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/arch/
commit: d05808a7a8313a66a0be67e89867b4c3a1fe5ca0
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 9 16:32:27 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Wed Sep 9 16:32:27 2015 +
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):
