sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add PATH_INSERT option to allow pre-appending a PATH variable for finding programs like pkg-config and freetype-config and allow it and PKG_CONFIG_PATH setting to work with relative paths by completing dynamically

Browse source
This commit is contained in:
Dane Springmeyer 2011-08-11 15:49:57 +00:00
parent 2d258e7bba
commit 17e5fb7302
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SConstruct
View file

@ -310,6 +310,7 @@ opts.AddVariables(
('PREFIX', 'The install path "prefix"', '/usr/local'), ('PREFIX', 'The install path "prefix"', '/usr/local'),
('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''), ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
('PATH_INSERT', 'A custom path to append to the $PATH env to prioritize usage of shell programs like pkg-config will be used if multiple are present on the system', ''),
# Boost variables # Boost variables
# default is '/usr/include', see FindBoost method below # default is '/usr/include', see FindBoost method below
@ -415,6 +416,8 @@ pickle_store = [# Scons internal variables
'LIBTOOL_SUPPORTS_ADVISE', 'LIBTOOL_SUPPORTS_ADVISE',
'PYTHON_IS_64BIT', 'PYTHON_IS_64BIT',
'SAMPLE_INPUT_PLUGINS', 'SAMPLE_INPUT_PLUGINS',
'PKG_CONFIG_PATH',
'PATH_INSERT',
] ]
# Add all other user configurable options to pickle pickle_store # Add all other user configurable options to pickle pickle_store
@ -938,8 +941,10 @@ if not preconfigured:
env['PLUGINS'] = PLUGINS env['PLUGINS'] = PLUGINS
if env['PKG_CONFIG_PATH']: if env['PKG_CONFIG_PATH']:
env['ENV']['PKG_CONFIG_PATH'] = env['PKG_CONFIG_PATH'] env['ENV']['PKG_CONFIG_PATH'] = os.path.realpath(env['PKG_CONFIG_PATH'])
# otherwise this variable == os.environ["PKG_CONFIG_PATH"] # otherwise this variable == os.environ["PKG_CONFIG_PATH"]
if env['PATH_INSERT']:
env['ENV']['PATH'] = os.path.realpath(env['PATH_INSERT']) + ':' + env['ENV']['PATH']
thread_suffix = 'mt' thread_suffix = 'mt'
if env['PLATFORM'] == 'FreeBSD': if env['PLATFORM'] == 'FreeBSD':
@ -1423,9 +1428,6 @@ if not preconfigured:
# autogenerate help on default/current SCons options # autogenerate help on default/current SCons options
Help(opts.GenerateHelpText(env)) Help(opts.GenerateHelpText(env))
#env.Prepend(CPPPATH = '/usr/local/include')
#env.Prepend(LIBPATH = '/usr/local/lib')
#### Builds #### #### Builds ####
if not HELP_REQUESTED: if not HELP_REQUESTED:
@ -1435,9 +1437,12 @@ if not HELP_REQUESTED:
env['create_uninstall_target'] = create_uninstall_target env['create_uninstall_target'] = create_uninstall_target
if env['PKG_CONFIG_PATH']: if env['PKG_CONFIG_PATH']:
env['ENV']['PKG_CONFIG_PATH'] = env['PKG_CONFIG_PATH'] env['ENV']['PKG_CONFIG_PATH'] = os.path.realpath(env['PKG_CONFIG_PATH'])
# otherwise this variable == os.environ["PKG_CONFIG_PATH"] # otherwise this variable == os.environ["PKG_CONFIG_PATH"]
if env['PATH_INSERT']:
env['ENV']['PATH'] = os.path.realpath(env['PATH_INSERT']) + ':' + env['ENV']['PATH']
# export env so it is available in Sconscript files # export env so it is available in Sconscript files
Export('env') Export('env')