Attachment #567722 for bug #679386

Lines 55-60 class stage1(StageBase): Link Here

(-)catalyst-3.0.4.orig/catalyst/targets/stage1.py (+4 lines)
55	if "ldflags" in self.settings:	55	if "ldflags" in self.settings:
56	self.settings["LDFLAGS"] = self.settings["ldflags"]	56	self.settings["LDFLAGS"] = self.settings["ldflags"]
57		57
		58	def override_asflags(self):
		59	if "asflags" in self.settings:
		60	self.settings["ASFLAGS"] = self.settings["asflags"]
		61
58	def set_portage_overlay(self):	62	def set_portage_overlay(self):
59	StageBase.set_portage_overlay(self)	63	StageBase.set_portage_overlay(self)
60	if "portage_overlay" in self.settings:	64	if "portage_overlay" in self.settings:

Lines 36-41 class stage2(StageBase): Link Here

(-)catalyst-3.0.4.orig/catalyst/targets/stage2.py (+4 lines)
36	if "ldflags" in self.settings:	36	if "ldflags" in self.settings:
37	self.settings["LDFLAGS"] = self.settings["ldflags"]	37	self.settings["LDFLAGS"] = self.settings["ldflags"]
38		38
		39	def override_asflags(self):
		40	if "asflags" in self.settings:
		41	self.settings["ASFLAGS"] = self.settings["asflags"]
		42
39	def set_portage_overlay(self):	43	def set_portage_overlay(self):
40	StageBase.set_portage_overlay(self)	44	StageBase.set_portage_overlay(self)
41	if "portage_overlay" in self.settings:	45	if "portage_overlay" in self.settings:

Lines 32-37 class stage3(StageBase): Link Here

(-)catalyst-3.0.4.orig/catalyst/targets/stage3.py (+4 lines)
32	if "ldflags" in self.settings:	32	if "ldflags" in self.settings:
33	self.settings["LDFLAGS"] = self.settings["ldflags"]	33	self.settings["LDFLAGS"] = self.settings["ldflags"]
34		34
		35	def override_asflags(self):
		36	if "asflags" in self.settings:
		37	self.settings["ASFLAGS"] = self.settings["asflags"]
		38
35	def set_portage_overlay(self):	39	def set_portage_overlay(self):
36	StageBase.set_portage_overlay(self)	40	StageBase.set_portage_overlay(self)
37	if "portage_overlay" in self.settings:	41	if "portage_overlay" in self.settings:

Return to bug 679386