diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2020-02-11 00:22:15 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-02-11 16:46:31 -0800 |
| commit | 89b9507d8954bcef8d5df13420dc217f98858815 (patch) | |
| tree | 1ea90370f8b0ad2fa983f902ab9d06de889f7d3f | |
| parent | f5ab14744a6abec6ece2a7aeab584278ddbeac78 (diff) | |
| download | meta-openembedded-contrib-89b9507d8954bcef8d5df13420dc217f98858815.tar.gz | |
mozjs: Fix python3 build with gold
Fixes [1]
[1] http://errors.yoctoproject.org/Errors/Details/390559/
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch index 695dd97f6b..e525047df4 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch @@ -35,7 +35,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> build/moz.configure/init.configure | 31 +- build/moz.configure/keyfiles.configure | 4 +- build/moz.configure/old.configure | 32 +- - build/moz.configure/toolchain.configure | 16 +- + build/moz.configure/toolchain.configure | 18 +- build/moz.configure/util.configure | 9 +- build/moz.configure/windows.configure | 10 +- build/templates.mozbuild | 2 +- @@ -451,6 +451,15 @@ index fc640c75e..c5508dfb7 100755 def pgo_flags(compiler): if compiler.type in ('gcc', 'clang'): return namespace( +@@ -1517,6 +1517,8 @@ def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_e + gold = check_cmd_output(*detection_cmd).strip() + if not gold: + return ++ if isinstance(gold, bytes): ++ gold = gold.decode('utf-8') + + goldFullPath = find_program(gold) + if goldFullPath is None: diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure index 3284fd8b5..218813e2d 100644 --- a/build/moz.configure/util.configure |