diff options
| author |   Alexey Neyman <stilor@att.net> | 2020-02-09 21:26:47 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-02-09 21:26:47 (GMT) |
| commit | be04d505106561360611c7246fc16a177c9bc167 (patch) | |
| tree | 560bde29666e37adfef6dc5ffe881829aa6c3e31 /scripts | |
| parent | a152d613139ef525dfd0ab3d31cd4bd4bbf97daf (diff) | |
| parent | 13511cfbc0c8253bdf7d6529e521e34a8754e6b7 (diff) | |
Merge pull request #1303 from stilor/wip
Update docker to ubuntu 19.10
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_tools/500-dtc.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/build/companion_tools/500-dtc.sh b/scripts/build/companion_tools/500-dtc.sh index ce0b303..a16ff62 100644 --- a/scripts/build/companion_tools/500-dtc.sh +++ b/scripts/build/companion_tools/500-dtc.sh @@ -48,11 +48,17 @@ do_dtc_backend() eval "${arg// /\\ }" done + # Override PKG_CONFIG: if pkg-config is not installed, DTC's makefile + # misinterprets the error code and tries to enable YAML support while + # not linking against libyaml. NO_YAML=1 is sufficient to make the build + # pass; PKG_CONFIG=/bin/true just suppresses some scary error messages. extra_opts=( \ CC="${host}-gcc" \ AR="${host}-ar" \ PREFIX="${prefix}" \ + PKG_CONFIG=/bin/true \ NO_PYTHON=1 \ + NO_YAML=1 \ BIN=dtc \ ) if [ -n "${CT_DTC_VERBOSE}" ]; then |