From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B642F139A8D for ; Tue, 8 Sep 2015 14:21:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65785141E3; Tue, 8 Sep 2015 14:21:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 102C2141E3 for ; Tue, 8 Sep 2015 14:21:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E57BC340649 for ; Tue, 8 Sep 2015 14:21:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7984317A for ; Tue, 8 Sep 2015 14:21:15 +0000 (UTC) From: "Richard 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, "Richard Farina" Message-ID: <1441722080.53af887e40b1cd00ab640b3a4dd6198f0059347b.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: Richard Farina X-VCS-Revision: 53af887e40b1cd00ab640b3a4dd6198f0059347b X-VCS-Branch: master Date: Tue, 8 Sep 2015 14:21:15 +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: 8fee0344-9824-41e9-97ec-1273ff6ac963 X-Archives-Hash: 83e5a3194ff07c477e431870e7b69c59 commit: 53af887e40b1cd00ab640b3a4dd6198f0059347b Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Sep 8 14:21:04 2015 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Sep 8 14:21:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=53af887e add asflags support per bug 538650 from Kumba catalyst/base/stagebase.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 17d88cd..5eb8fc9 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -41,7 +41,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.valid_values.extend(["version_stamp","target","subarch", "rel_type","profile","snapshot","source_subpath","portage_confdir", - "cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay", + "cflags","cxxflags","fcflags","fflags","ldflags","asflags","cbuild","hostuse","portage_overlay", "distcc_hosts","makeopts","pkgcache_path","kerncache_path", "compression_mode", "decompression_mode"]) @@ -304,6 +304,10 @@ class StageBase(TargetBase, ClearBase, GenBase): if "LDFLAGS" in self.makeconf: self.settings["LDFLAGS"]=self.makeconf["LDFLAGS"] + def override_asflags(self): + if "ASFLAGS" in self.makeconf: + self.settings["ASFLAGS"]=self.makeconf["ASFLAGS"] + def set_install_mask(self): if "install_mask" in self.settings: if type(self.settings["install_mask"])!=types.StringType: @@ -1033,6 +1037,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.override_fcflags() self.override_fflags() self.override_ldflags() + self.override_asflags() if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("chroot_setup"): print "Resume point detected, skipping chroot_setup operation..." @@ -1107,6 +1112,9 @@ class StageBase(TargetBase, ClearBase, GenBase): if "LDFLAGS" in self.settings: myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n") myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') + if "ASFLAGS" in self.settings: + myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n") + myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n') if "CBUILD" in self.settings: 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')