From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6E25138335 for ; Wed, 7 Nov 2018 19:50:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1B23E0970; Wed, 7 Nov 2018 19:50:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB8BDE0970 for ; Wed, 7 Nov 2018 19:50:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02C3F335C8D for ; Wed, 7 Nov 2018 19:50:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C922E443 for ; Wed, 7 Nov 2018 19:50:02 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1541620187.44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25 X-VCS-Branch: master Date: Wed, 7 Nov 2018 19:50:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2cf48a9-5fc8-4c84-b70f-d59d7ecaf514 X-Archives-Hash: 67d0a21d3a0db8fae1115db36ab521a3 commit: 44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Wed Nov 7 19:47:16 2018 +0000 Commit: Rick Farina gentoo 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) 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...')