1 |
commit: 7ea3f5a819318988c73989cbbde253e7b5c69e34 |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 1 15:34:05 2019 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 1 15:34:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ea3f5a8 |
7 |
|
8 |
maybe fix overrides for flags |
9 |
|
10 |
it seems cflags and cxxflags overrides work for me while common_flags, |
11 |
fcflags, and fflags overrides do not. This was the only difference I |
12 |
could find. I left breadcrumbs on my thought process. |
13 |
|
14 |
catalyst/targets/stage1.py | 14 ++++++++++++++ |
15 |
1 file changed, 14 insertions(+) |
16 |
|
17 |
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py |
18 |
index cc4366b6..59d6d49b 100644 |
19 |
--- a/catalyst/targets/stage1.py |
20 |
+++ b/catalyst/targets/stage1.py |
21 |
@@ -38,11 +38,17 @@ class stage1(StageBase): |
22 |
"/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"]) |
23 |
|
24 |
# XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target? |
25 |
+ # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-( |
26 |
+ # XXZ: I have a wierd suspicion that it's the difference in capitolization |
27 |
|
28 |
def override_chost(self): |
29 |
if "chost" in self.settings: |
30 |
self.settings["CHOST"] = self.settings["chost"] |
31 |
|
32 |
+ def override_common_flags(self): |
33 |
+ if "common_flags" in self.settings: |
34 |
+ self.settings["COMMON_FLAGS"] = self.settings["common_flags"] |
35 |
+ |
36 |
def override_cflags(self): |
37 |
if "cflags" in self.settings: |
38 |
self.settings["CFLAGS"] = self.settings["cflags"] |
39 |
@@ -51,6 +57,14 @@ class stage1(StageBase): |
40 |
if "cxxflags" in self.settings: |
41 |
self.settings["CXXFLAGS"] = self.settings["cxxflags"] |
42 |
|
43 |
+ def override_fcflags(self): |
44 |
+ if "fcflags" in self.settings: |
45 |
+ self.settings["FCFLAGS"] = self.settings["fcflags"] |
46 |
+ |
47 |
+ def override_fflags(self): |
48 |
+ if "fflags" in self.settings: |
49 |
+ self.settings["FFLAGS"] = self.settings["fflags"] |
50 |
+ |
51 |
def override_ldflags(self): |
52 |
if "ldflags" in self.settings: |
53 |
self.settings["LDFLAGS"] = self.settings["ldflags"] |