--- a/bake/Bake.py Mon Dec 03 11:34:16 2012 +0100
+++ b/bake/Bake.py Tue Dec 04 21:27:39 2012 +0100
@@ -713,12 +713,15 @@
#self._check_build_version(config, options)
def _do_build(configuration, module, env):
+ print(" >> Building " + module.name() )
+
if module.check_build_version(env):
retval = module.build(env, options.jobs, options.force_clean)
if retval:
module.update_libpath(env)
return retval
else:
+ print(" >> Building " + module.name() + " - Problem")
raise TaskError('Unavailable building tool for'
' module "%s". Try to call \"%s check\"\n' %
(module.name(), os.path.basename(sys.argv[0])))
--- a/bake/Dependencies.py Mon Dec 03 11:34:16 2012 +0100
+++ b/bake/Dependencies.py Tue Dec 04 21:27:39 2012 +0100
@@ -280,7 +280,7 @@
except:
success = False
import sys
- er = sys.exc_info()[0]
+ er = sys.exc_info()[1]
# import bake.Utils
# bake.Utils.print_backtrace()
print (" > Unexpected error: " + str(er))
@@ -294,7 +294,7 @@
except:
success = False
import sys
- er = sys.exc_info()[0]
+ er = sys.exc_info()[1]
print (" > Unexpected error: " + str(er))
if not success:
if not self._sources.has_key(i.dst()):
--- a/bake/Module.py Mon Dec 03 11:34:16 2012 +0100
+++ b/bake/Module.py Tue Dec 04 21:27:39 2012 +0100
@@ -235,7 +235,6 @@
os.mkdir(env.objdir)
try:
- print(" >> Building " + self._name )
if not os.path.isdir(env.srcdir):
raise TaskError('Source is not available for module %s: '
'directory %s not found. Try %s download first.' %
--- a/bake/ModuleBuild.py Mon Dec 03 11:34:16 2012 +0100
+++ b/bake/ModuleBuild.py Tue Dec 04 21:27:39 2012 +0100
@@ -651,8 +651,11 @@
options = []
if self.attribute('configure_arguments').value != '':
- command= (env.replace_variables(env.replace_variables(self.attribute('configure_arguments').value))
- + ' --prefix=' + env.objdir)
+ command= (env.replace_variables(env.replace_variables(self.attribute('configure_arguments').value)))
+
+ if not "--prefix" in command:
+ command = command + ' --prefix=' + env.objdir
+
command= bake.Utils.split_args(command)
env.run(command, directory=env.objdir)
--- a/bakeconf.xml Mon Dec 03 11:34:16 2012 +0100
+++ b/bakeconf.xml Tue Dec 04 21:27:39 2012 +0100
@@ -111,6 +111,7 @@
</source>
<build type="autotools" objdir="yes">
<attribute name="configure_arguments" value="../configure --prefix=$INSTALLDIR --exec-prefix=$INSTALLDIR -enable-userlevel --disable-linuxmodule --enable-nsclick --enable-wifi"/>
+ <attribute name="post_installation" value="mkdir $INSTALLDIR/lib; cp -r $OBJDIR/include $INSTALLDIR/lib/."/>
</build>
</module>