From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1097912-garchives=archives.gentoo.org@lists.gentoo.org> 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 AEE2D138334 for <garchives@archives.gentoo.org>; Mon, 1 Jul 2019 15:35:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 911C0E089D; Mon, 1 Jul 2019 15:35:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 746A7E089D for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2019 15:35:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BAA28346ABC for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2019 15:35:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 339B4626 for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2019 15:35:01 +0000 (UTC) From: "Rick Farina" <zerochaos@gentoo.org> 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" <zerochaos@gentoo.org> Message-ID: <1561995245.7ea3f5a819318988c73989cbbde253e7b5c69e34.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 7ea3f5a819318988c73989cbbde253e7b5c69e34 X-VCS-Branch: master Date: Mon, 1 Jul 2019 15:35:01 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d0b1257d-3ce1-4d72-b74c-8ad226c440a5 X-Archives-Hash: 88a1efdc1fc24c5e9875b9ec61baa103 commit: 7ea3f5a819318988c73989cbbde253e7b5c69e34 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> AuthorDate: Mon Jul 1 15:34:05 2019 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Mon Jul 1 15:34:05 2019 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ea3f5a8 maybe fix overrides for flags it seems cflags and cxxflags overrides work for me while common_flags, fcflags, and fflags overrides do not. This was the only difference I could find. I left breadcrumbs on my thought process. catalyst/targets/stage1.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index cc4366b6..59d6d49b 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -38,11 +38,17 @@ class stage1(StageBase): "/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"]) # XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target? + # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-( + # XXZ: I have a wierd suspicion that it's the difference in capitolization def override_chost(self): if "chost" in self.settings: self.settings["CHOST"] = self.settings["chost"] + def override_common_flags(self): + if "common_flags" in self.settings: + self.settings["COMMON_FLAGS"] = self.settings["common_flags"] + def override_cflags(self): if "cflags" in self.settings: self.settings["CFLAGS"] = self.settings["cflags"] @@ -51,6 +57,14 @@ class stage1(StageBase): if "cxxflags" in self.settings: self.settings["CXXFLAGS"] = self.settings["cxxflags"] + def override_fcflags(self): + if "fcflags" in self.settings: + self.settings["FCFLAGS"] = self.settings["fcflags"] + + def override_fflags(self): + if "fflags" in self.settings: + self.settings["FFLAGS"] = self.settings["fflags"] + def override_ldflags(self): if "ldflags" in self.settings: self.settings["LDFLAGS"] = self.settings["ldflags"]