Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 65932
Collapse All | Expand All

(-)/usr/lib/catalyst/modules/generic_stage_target.py (-11 / +23 lines)
Lines 288-319 Link Here
288
		myf.write("# Please consult /etc/make.conf.example for a more detailed example\n")
288
		myf.write("# Please consult /etc/make.conf.example for a more detailed example\n")
289
		myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
289
		myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
290
		myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
290
		myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
291
		
291
292
		# figure out what our USE vars are for building
292
		# figure out what our USE vars are for building
293
		myusevars=[]
293
		myusevars=[]
294
		if self.settings.has_key("HOSTUSE"):
294
		if self.settings.has_key("HOSTUSE"):
295
			myusevars.extend(self.settings["HOSTUSE"])
295
			if type(self.settings.has_key("HOSTUSE"))==str:
296
			
296
				myusevars.append(self.settings["HOSTUSE"])
297
			elif type(self.settings.has_key("HOSTUSE"))==list:
298
				myusevars.extend(self.settings["HOSTUSE"])
299
297
		if self.settings["target"]=="grp":
300
		if self.settings["target"]=="grp":
298
			myusevars.append("bindist")
301
			myusevars.append("bindist")
299
			myusevars.extend(self.settings["grp/use"])
302
			if type(self.settings("grp/use"))==str:
303
				myusevars.append(self.settings["grp/use"])
304
			elif type(self.settings.has_key("grp/use"))==list:
305
				myusevars.extend(self.settings["grp/use"])
300
			myf.write('USE="'+string.join(myusevars)+'"\n')
306
			myf.write('USE="'+string.join(myusevars)+'"\n')
301
			
307
302
		elif self.settings["target"]=="tinderbox":
308
		elif self.settings["target"]=="tinderbox":
303
			myusevars.extend(self.settings["tinderbox/use"])
309
			if type(self.settings("tinderbox/use"))==str:
310
				myusevars.append(self.settings["tinderbox/use"])
311
			elif type(self.settings.has_key("tinderbox/use"))==list:
312
				myusevars.extend(self.settings["tinderbox/use"])
304
			myf.write('USE="'+string.join(myusevars)+'"\n')
313
			myf.write('USE="'+string.join(myusevars)+'"\n')
305
			
314
306
		elif self.settings["target"]=="livecd-stage1":
315
		elif self.settings["target"]=="livecd-stage1":
307
			myusevars.extend(self.settings["livecd/use"])
316
			myusevars.append(self.settings["livecd/use"])
308
			myf.write('USE="'+string.join(myusevars)+'"\n')
317
			myf.write('USE="'+string.join(myusevars)+'"\n')
309
			
318
			
310
		elif self.settings["target"]=="embedded":
319
		elif self.settings["target"]=="embedded":
311
			myusevars.extend(self.settings["embedded/use"])
320
			if type(self.settings("embedded/use"))==str:
321
				myusevars.append(self.settings["embedded/use"])
322
			elif type(self.settings("embedded/use"))==list:
323
				myusevars.extend(self.settings["embedded/use"])
312
			myf.write('USE="'+string.join(myusevars)+'"\n')
324
			myf.write('USE="'+string.join(myusevars)+'"\n')
313
			
325
314
		if self.settings.has_key("CXXFLAGS"):
326
		if self.settings.has_key("CXXFLAGS"):
315
			myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
327
			myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
316
		
328
317
		else:
329
		else:
318
			myf.write('CXXFLAGS="${CFLAGS}"\n')
330
			myf.write('CXXFLAGS="${CFLAGS}"\n')
319
		myf.close()
331
		myf.close()

Return to bug 65932