RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 01:22:30 +00:00
Code Issues Releases Wiki Activity

build: if libdir is not set, set it to EXEC_PREFIX/lib

Browse Source 
This way the behavior of default libdir stays consistent before and
after switching to gnu_dirs from waf itself.
This commit is contained in:
Jan Ekström 2018-07-18 02:26:06 +03:00
parent 15a6d0028e
commit 2f7dc16995
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wscript
View File

@ -941,6 +941,12 @@ def options(opt):
opt.parser.remove_option("--pdfdir") opt.parser.remove_option("--pdfdir")
opt.parser.remove_option("--psdir") opt.parser.remove_option("--psdir")
libdir = opt.parser.get_option('--libdir')
if libdir:
# Replace any mention of lib64 as we keep the default
# for libdir the same as before the waf update.
libdir.help = libdir.help.replace('lib64', 'lib')
group = opt.get_option_group("Installation directories") group = opt.get_option_group("Installation directories")
for ident, default, desc in _INSTALL_DIRS_LIST: for ident, default, desc in _INSTALL_DIRS_LIST:
group.add_option('--{0}'.format(ident), group.add_option('--{0}'.format(ident),
@ -983,6 +989,7 @@ def is_debug_build(ctx):
return getattr(ctx.options, 'enable_debug-build') return getattr(ctx.options, 'enable_debug-build')
def configure(ctx): def configure(ctx):
from waflib import Options
ctx.resetenv(ctx.options.variant) ctx.resetenv(ctx.options.variant)
ctx.check_waf_version(mini='1.8.4') ctx.check_waf_version(mini='1.8.4')
target = os.environ.get('TARGET') target = os.environ.get('TARGET')
@ -1013,6 +1020,12 @@ def configure(ctx):
ctx.load('detections.devices') ctx.load('detections.devices')
ctx.load('gnu_dirs') ctx.load('gnu_dirs')
# if libdir is not set in command line options,
# override the gnu_dirs default in order to
# always have `lib/` as the library directory.
if not getattr(Options.options, 'LIBDIR', None):
ctx.env['LIBDIR'] = Utils.subst_vars(os.path.join('${EXEC_PREFIX}', 'lib'), ctx.env)
for ident, _, _ in _INSTALL_DIRS_LIST: for ident, _, _ in _INSTALL_DIRS_LIST:
varname = ident.upper() varname = ident.upper()
ctx.env[varname] = getattr(ctx.options, ident) ctx.env[varname] = getattr(ctx.options, ident)