walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: fix subproject build regression 

commit ae9ac2a1 from !165 introduced a regression when
fontconfig is built as a subproject. In that case we
would fail to correctly construct the path to the root
build dir where the meson-info subdirectory resides,
instead looking for it in the fontconfig subproject
subdir. This would result in
FAILED: subprojects/fontconfig/src/fcobjshash.gperf
errors in the cutout.py script.

Instead use the @BUILD_ROOT@ substitution to get
to the build root which will work correctly in
either scenario.
This commit is contained in:
Tim-Philipp Müller 2021-02-16 23:41:38 +00:00 committed by Akira TAGOH
parent ba15d41bdc
commit dba3287bf5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/meson.build
View File

@ -44,13 +44,10 @@ endif
cpp += ['-I', join_paths(meson.current_source_dir(), '..')] cpp += ['-I', join_paths(meson.current_source_dir(), '..')]
# Can use meson.project_build_dir() once we require Meson 0.56
project_build_dir = meson.current_build_dir() / '..'
fcobjshash_gperf = custom_target('fcobjshash.gperf', fcobjshash_gperf = custom_target('fcobjshash.gperf',
input: 'fcobjshash.gperf.h', input: 'fcobjshash.gperf.h',
output: 'fcobjshash.gperf', output: 'fcobjshash.gperf',
command: [python3, files('cutout.py')[0], '@INPUT@', '@OUTPUT@', project_build_dir, cpp], command: [python3, files('cutout.py')[0], '@INPUT@', '@OUTPUT@', '@BUILD_ROOT@', cpp],
build_by_default: true, build_by_default: true,
) )