scons: deleting the scons db is not needed, just ensuring permissions work for non-root users to avoid dependency checks failing for lousy reasons
This commit is contained in:
parent
52eb500749
commit
50e3799053
1 changed files with 7 additions and 15 deletions
22
SConstruct
22
SConstruct
|
@ -263,14 +263,6 @@ if opts.args:
|
||||||
# now since we've got custom arguments we'll disregard any
|
# now since we've got custom arguments we'll disregard any
|
||||||
# pickled environment and force another configuration
|
# pickled environment and force another configuration
|
||||||
preconfigured = False
|
preconfigured = False
|
||||||
if opts.args.get('FAST'):
|
|
||||||
# because we are clearing the 'sconf_temp' files each configure when FAST=False
|
|
||||||
# we now need to flush the dblite otherwise SCons will skip checks
|
|
||||||
# of fail because .sconsign.dblite could be out of sync with cacheing from using
|
|
||||||
# or moving to using FAST=True
|
|
||||||
try:
|
|
||||||
os.unlink('.sconsign.dblite')
|
|
||||||
except: pass
|
|
||||||
|
|
||||||
elif preconfigured:
|
elif preconfigured:
|
||||||
if ('-h' not in command_line_args) and ('--help' not in command_line_args):
|
if ('-h' not in command_line_args) and ('--help' not in command_line_args):
|
||||||
|
@ -921,6 +913,9 @@ if not preconfigured:
|
||||||
pickle.dump(pickle_dict,env_cache)
|
pickle.dump(pickle_dict,env_cache)
|
||||||
env_cache.close()
|
env_cache.close()
|
||||||
# fix up permissions on configure outputs
|
# fix up permissions on configure outputs
|
||||||
|
# this is hackish but avoids potential problems
|
||||||
|
# with a non-root configure following a root install
|
||||||
|
# that also triggered a re-configure
|
||||||
try:
|
try:
|
||||||
os.chmod(SCONS_CONFIGURE_CACHE,0666)
|
os.chmod(SCONS_CONFIGURE_CACHE,0666)
|
||||||
except: pass
|
except: pass
|
||||||
|
@ -928,15 +923,12 @@ if not preconfigured:
|
||||||
os.chmod(SCONS_LOCAL_CONFIG,0666)
|
os.chmod(SCONS_LOCAL_CONFIG,0666)
|
||||||
except: pass
|
except: pass
|
||||||
try:
|
try:
|
||||||
os.chmod('.sconsign.dblite',0666)
|
os.chmod('.sconsign.dblite',0777)
|
||||||
|
except: pass
|
||||||
|
try:
|
||||||
|
os.chmod(SCONF_TEMP_DIR,0777)
|
||||||
except: pass
|
except: pass
|
||||||
|
|
||||||
# clean up test build targets
|
|
||||||
if not env['FAST']:
|
|
||||||
try:
|
|
||||||
for test in glob('%s/*' % SCONF_TEMP_DIR):
|
|
||||||
os.unlink(test)
|
|
||||||
except: pass
|
|
||||||
if 'configure' in command_line_args:
|
if 'configure' in command_line_args:
|
||||||
color_print(4,'\n*Configure complete*\nNow run "python scons/scons.py" to build or "python scons/scons.py install" to install')
|
color_print(4,'\n*Configure complete*\nNow run "python scons/scons.py" to build or "python scons/scons.py install" to install')
|
||||||
Exit(0)
|
Exit(0)
|
||||||
|
|
Loading…
Reference in a new issue