diff -Naurp catalyst-2.0.18.stage3-fixes/modules/generic_stage_target.py catalyst-2.0.18.asflags/modules/generic_stage_target.py --- catalyst-2.0.18.stage3-fixes/modules/generic_stage_target.py 2015-01-08 23:44:23.000000000 -0500 +++ catalyst-2.0.18.asflags/modules/generic_stage_target.py 2015-02-03 05:15:03.331626513 -0500 @@ -15,8 +15,9 @@ class generic_stage_target(generic_targe self.valid_values.extend(["version_stamp","target","subarch",\ "rel_type","profile","snapshot","source_subpath","portage_confdir",\ - "cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\ - "distcc_hosts","makeopts","pkgcache_path","kerncache_path"]) + "cflags","cxxflags","ldflags","asflags","cbuild","hostuse",\ + "portage_overlay","distcc_hosts","makeopts","pkgcache_path",\ + "kerncache_path"]) self.set_valid_build_kernel_vars(addlargs) generic_target.__init__(self,myspec,addlargs) @@ -257,6 +258,10 @@ class generic_stage_target(generic_targe 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: @@ -988,6 +993,7 @@ class generic_stage_target(generic_targe self.override_cflags() self.override_cxxflags() self.override_ldflags() + self.override_asflags() if "AUTORESUME" in self.settings \ and os.path.exists(self.settings["autoresume_path"]+"chroot_setup"): print "Resume point detected, skipping chroot_setup operation..." @@ -1048,6 +1054,9 @@ class generic_stage_target(generic_targe 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') diff -Naurp catalyst-2.0.18.stage3-fixes/modules/stage1_target.py catalyst-2.0.18.asflags/modules/stage1_target.py --- catalyst-2.0.18.stage3-fixes/modules/stage1_target.py 2015-01-08 23:44:23.000000000 -0500 +++ catalyst-2.0.18.asflags/modules/stage1_target.py 2015-02-03 03:52:45.561655866 -0500 @@ -48,6 +48,10 @@ class stage1_target(generic_stage_target if "ldflags" in self.settings: self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def override_asflags(self): + if "asflags" in self.settings: + self.settings["ASFLAGS"]=list_to_string(self.settings["asflags"]) + def set_portage_overlay(self): generic_stage_target.set_portage_overlay(self) if "portage_overlay" in self.settings: diff -Naurp catalyst-2.0.18.stage3-fixes/modules/stage2_target.py catalyst-2.0.18.asflags/modules/stage2_target.py --- catalyst-2.0.18.stage3-fixes/modules/stage2_target.py 2015-01-08 23:44:23.000000000 -0500 +++ catalyst-2.0.18.asflags/modules/stage2_target.py 2015-02-03 03:52:45.561655866 -0500 @@ -49,6 +49,10 @@ class stage2_target(generic_stage_target if "ldflags" in self.settings: self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def override_asflags(self): + if "asflags" in self.settings: + self.settings["ASFLAGS"]=list_to_string(self.settings["asflags"]) + def set_portage_overlay(self): generic_stage_target.set_portage_overlay(self) if "portage_overlay" in self.settings: diff -Naurp catalyst-2.0.18.stage3-fixes/modules/stage3_target.py catalyst-2.0.18.asflags/modules/stage3_target.py --- catalyst-2.0.18.stage3-fixes/modules/stage3_target.py 2015-02-03 03:50:33.911656649 -0500 +++ catalyst-2.0.18.asflags/modules/stage3_target.py 2015-02-03 03:52:45.561655866 -0500 @@ -31,6 +31,10 @@ class stage3_target(generic_stage_target if "ldflags" in self.settings: self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def override_asflags(self): + if "asflags" in self.settings: + self.settings["ASFLAGS"]=list_to_string(self.settings["asflags"]) + def set_portage_overlay(self): generic_stage_target.set_portage_overlay(self) if "portage_overlay" in self.settings: