ardour/livetrax
13
0
Fork 0
Code

add --depstack-root option to waf to allow building with gtk/ardour dependency stacks in various locations; clean up libintl logic in wscript

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@14099 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-02-26 14:29:58 +00:00
parent f2f9a2341e
commit 126802ffc5
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
wscript
View File

@ -399,6 +399,8 @@ def options(opt):
help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)') help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)')
opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug', opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug',
help='Compile with Boost shared pointer debugging') help='Compile with Boost shared pointer debugging')
opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root',
help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)')
opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', opt.add_option('--dist-target', type='string', default='auto', dest='dist_target',
help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]') help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]')
opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
@ -477,39 +479,34 @@ def configure(conf):
print('Please use a different version or re-configure with --debug') print('Please use a different version or re-configure with --debug')
exit (1) exit (1)
# libintl may or may not be trivially locatable. On OS X this is always # systems with glibc have libintl builtin. systems without require explicit
# true. On Linux it will depend on whether we're on a normal Linux distro, # linkage against libintl.
# in which case libintl.h is going to be available in /usr/include and
# the library itself is part of glibc, or on a bare-bones build system
# where we need to pick it up from the GTK dependency stack.
# #
user_gtk_root = os.path.expanduser ('~/gtk/inst')
pkg_config_path = os.getenv('PKG_CONFIG_PATH') pkg_config_path = os.getenv('PKG_CONFIG_PATH')
if os.path.isfile ('/usr/include/libintl.h'): user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst')
# libintl is part of the system., so use it
autowaf.display_msg(conf, 'Will reply on libintl built into libc', 'yes') if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0:
# told to search user_gtk_root
prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
preflib = ''.join ([ '-L', user_gtk_root + '/lib'])
conf.env.append_value('CFLAGS', [ prefinclude ])
conf.env.append_value('CXXFLAGS', [prefinclude ])
conf.env.append_value('LINKFLAGS', [ preflib ])
autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
else: else:
if (pkg_config_path is not None): autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
# told to search for pkgconfig files
if pkg_config_path.find (user_gtk_root) >= 0:
# told to search user_gtk_root
prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
preflib = ''.join ([ '-L', user_gtk_root + '/lib'])
conf.env.append_value('CFLAGS', [ prefinclude ])
conf.env.append_value('CXXFLAGS', [prefinclude ])
conf.env.append_value('LINKFLAGS', [ preflib ])
conf.define ('NEED_INTL', 1)
autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes')
else:
print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH does not include ', user_gtk_root, '- this needs fixing before the build can continue')
sys.exit (-1)
else:
print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH is not set - this needs fixing before the build can continue')
if sys.platform == 'darwin':
conf.define ('NEED_INTL', 1)
autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes')
else:
# libintl is part of the system, so use it
autowaf.display_msg(conf, 'Will rely on libintl built into libc', 'yes')
user_ardour_root = os.path.expanduser ('~/a3/inst') user_ardour_root = os.path.expanduser (Options.options.depstack_root + '/a3/inst')
if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: if pkg_config_path is not None and pkg_config_path.find (user_ardour_root) >= 0:
# XXXX hack hack hack # told to search user_ardour_root
prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) prefinclude = ''.join ([ '-I', user_ardour_root + '/include'])
preflib = ''.join ([ '-L', user_ardour_root + '/lib']) preflib = ''.join ([ '-L', user_ardour_root + '/lib'])
conf.env.append_value('CFLAGS', [ prefinclude ]) conf.env.append_value('CFLAGS', [ prefinclude ])