diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/pingus/files/sconstruct.diff | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/pingus/files/sconstruct.diff')
| -rw-r--r-- | recipes/pingus/files/sconstruct.diff | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes/pingus/files/sconstruct.diff b/recipes/pingus/files/sconstruct.diff new file mode 100644 index 0000000000..0ca3c3675f --- /dev/null +++ b/recipes/pingus/files/sconstruct.diff @@ -0,0 +1,49 @@ +--- a/SConstruct 2007-10-30 10:23:37.000000000 +0100 ++++ b/SConstruct 2008-09-30 01:38:17.000000000 +0200 +@@ -334,8 +334,8 @@ + + def DefineOptions(filename, args): + opts = Options(filename, args) +- opts.Add('CC', 'C Compiler', 'gcc') +- opts.Add('CXX', 'C++ Compiler', 'g++') ++ opts.Add('CC', 'C Compiler', os.environ['CC']) ++ opts.Add('CXX', 'C++ Compiler', os.environ['CXX']) + # opts.Add('debug', 'Build with debugging options', 0) + # opts.Add('profile', 'Build with profiling support', 0) + +@@ -526,14 +526,15 @@ + ARGUMENTS = {} + + if not ('configure' in COMMAND_LINE_TARGETS): +- if ARGUMENTS != {}: +- print "Error: You must not supply arguments to the compile step." +- print "Use:" +- print "" +- print " scons configure [ARGUMENTS]..." +- print "" +- print "If you want to change the build configuration." +- os.sys.exit(1) ++# if ARGUMENTS != {}: ++# print "Error: You must not supply arguments to the compile step." ++# print ARGUMENTS ++# print "Use:" ++# print "" ++# print " scons configure [ARGUMENTS]..." ++# print "" ++# print "If you want to change the build configuration." ++# os.sys.exit(1) + + opts = DefineOptions("config.py", {}) + env = Environment(options = opts) +@@ -541,6 +542,11 @@ + + opts.Update(env) + env['CPPPATH'] += ['.', 'src/'] ++ env['ENV']['CXX'] = os.environ['CXX'] ++ env['ENV']['CC'] = os.environ['CC'] ++ env['ENV']['CPP'] = os.environ['CPP'] ++ env['ENV']['RANLIB'] = os.environ['RANLIB'] ++ env['ENV']['PATH'] = os.environ['PATH'] + Default(env.Program('pingus', pingus_sources + env['optional_sources'])) + Clean('pingus', ['config.py', 'config.h']) + |