ardour/livetrax
13
0
Fork 0
Code

Fix build-stack revision path (3d952b095)

Browse Source
This commit is contained in:
Robin Gareus 2017-04-04 17:42:10 +02:00
parent 3d952b095a
commit b38e81d261
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wscript
View File

@ -287,10 +287,10 @@ def create_stored_revision():
def get_depstack_rev(depstack_root): def get_depstack_rev(depstack_root):
try: try:
with open(depstack_root + '/.vers', 'r') as f: with open(depstack_root + '/../.vers', 'r') as f:
return f.readline() return f.readline()
except IOError: except IOError:
return ''; return '-unknown-';
def set_compiler_flags (conf,opt): def set_compiler_flags (conf,opt):
# #
@ -859,7 +859,7 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', [prefinclude ]) conf.env.append_value('CXXFLAGS', [prefinclude ])
conf.env.append_value('LINKFLAGS', [ preflib ]) conf.env.append_value('LINKFLAGS', [ preflib ])
autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes') autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
conf.env['DEPSTACK_REV'] = get_depstack_rev (user_gtk_root) conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root)
else: else:
autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no') autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
conf.env['DEPSTACK_REV'] = '-system-' conf.env['DEPSTACK_REV'] = '-system-'