From: Chris Gianelloni Date: Wed, 6 Feb 2008 22:47:00 +0000 (+0000) Subject: Write out HOSTUSE settings from arch/*.py to make.conf as well as any USE flags defin... X-Git-Tag: CATALYST_2_0_6_916~216 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f88a2056eab07dadc3d04abdbc5e6bb2090d1f21;p=catalyst.git Write out HOSTUSE settings from arch/*.py to make.conf as well as any USE flags defined in the spec file. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1278 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 1e72fadf..69b5211a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Feb 2008; Chris Gianelloni + modules/generic_stage_target.py: + Write out HOSTUSE settings from arch/*.py to make.conf as well as any USE + flags defined in the spec file. + 06 Feb 2008; Chris Gianelloni arch/ppc64.py: Added a patch from Markus Rothe to add power6 and cell subarches to ppc64 for bug #208860 and removing redundant CXXFLAGS settings, diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 457669c1..03aeb0a1 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -910,13 +910,15 @@ class generic_stage_target(generic_target): myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') myf.write('# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing it.\nCHOST="'+self.settings["CHOST"]+'"\n') - # Figure out what our USE vars are for building + # Figure out what our USE vars are for building myusevars=[] if self.settings.has_key("HOSTUSE"): myusevars.extend(self.settings["HOSTUSE"]) if self.settings.has_key("use"): myusevars.extend(self.settings["use"]) + + if myusevars: myf.write('USE="'+string.join(myusevars)+'"\n') # Setup the portage overlay