diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-17 22:59:33 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-17 22:59:33 -0500 |
| commit | 4121d757132680b2c3295035350cebd258569b54 (patch) | |
| tree | af4f7617db9c7e2dba6a5b063799c332aad4e07d | |
| parent | ecdaf7930e12348d66d3270548d98c61b6bcc76f (diff) | |
| download | uxp-4121d757132680b2c3295035350cebd258569b54.tar.gz | |
[aom] Filter out CONFIG_EXT_PARTITION_TYPES
aom_dsp_rtcd_defs.pl checks only whether this key is present in the config, not whether it is set to true or not. Our script sets CONFIG_FOO=no for disabled options, while the upstream build system omits them, resulting in extra symbol declarations the build will never define.
Work around this by stripping the offending disabled config key if it is disabled.
| -rwxr-xr-x | media/libaom/lint_config.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libaom/lint_config.sh b/media/libaom/lint_config.sh index 1a6c96dfbb..1314b44e94 100755 --- a/media/libaom/lint_config.sh +++ b/media/libaom/lint_config.sh @@ -104,6 +104,9 @@ fi combined_config="$(echo "$combined_config" | grep -v ARCH_X86=no)" combined_config="$(echo "$combined_config" | grep -v ARCH_X86_64=no)" +# aom_dsp_rtcd_defs.h checks for definition here, not value. +combined_config="$(echo "$combined_config" | grep -v CONFIG_EXT_PARTITION_TYPES=no)" + # Print out the unique configurations. if [ -n "$out_file" ]; then echo "$combined_config" | sort | uniq > $out_file |