commit: 44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 19:47:16 2018 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 19:49:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44fcaf16
allow custom COMMON_FLAGS
instead of forcing the user to override *FLAGS, just let them set
COMMON_FLAGS directly
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
catalyst/base/stagebase.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 7665834c..54a1f389 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -39,7 +39,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"rel_type", "profile", "snapshot", "source_subpath",
"portage_confdir", "portage_prefix", "portage_overlay",
"cflags", "cxxflags", "fcflags", "fflags", "ldflags",
"asflags",
- "cbuild", "hostuse", "catalyst_use",
+ "common_flags", "cbuild", "hostuse", "catalyst_use",
"distcc_hosts", "makeopts", "pkgcache_path",
"kerncache_path",
"compression_mode", "decompression_mode"])
@@ -305,6 +305,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "ASFLAGS" in self.makeconf:
self.settings["ASFLAGS"] = self.makeconf["ASFLAGS"]
+ def override_common_flags(self):
+ if "COMMON_FLAGS" in self.makeconf:
+ self.settings["COMMON_FLAGS"] =
self.makeconf["COMMON_FLAGS"]
+
def set_install_mask(self):
if "install_mask" in self.settings:
if not isinstance(self.settings['install_mask'], str):
@@ -1042,6 +1046,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.override_fflags()
self.override_ldflags()
self.override_asflags()
+ self.override_common_flags()
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("chroot_setup"):
log.notice('Resume point detected, skipping
chroot_setup operation...')
