[gentoo-commits] catalyst r1278 - in trunk: . modules

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-02-06 22:47:00 +0000 (Wed, 06 Feb 2008)
New Revision: 1278

Modified:
   trunk/ChangeLog
   trunk/modules/generic_stage_target.py
Log:
Write out HOSTUSE settings from arch/*.py to make.conf as well as any USE flags defined in the spec file.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-06 22:45:22 UTC (rev 1277)
+++ trunk/ChangeLog	2008-02-06 22:47:00 UTC (rev 1278)
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
+  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 <wolf31o2@g.o> arch/ppc64.py:
   Added a patch from Markus Rothe <corsair@g.o> to add power6 and cell
   subarches to ppc64 for bug #208860 and removing redundant CXXFLAGS settings,

Modified: trunk/modules/generic_stage_target.py
===================================================================
--- trunk/modules/generic_stage_target.py	2008-02-06 22:45:22 UTC (rev 1277)
+++ trunk/modules/generic_stage_target.py	2008-02-06 22:47:00 UTC (rev 1278)
@@ -910,13 +910,15 @@
 				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	

-- 
gentoo-commits@l.g.o mailing list