summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-02-11 00:22:15 +0100
committerKhem Raj <raj.khem@gmail.com>2020-02-11 16:46:31 -0800
commit89b9507d8954bcef8d5df13420dc217f98858815 (patch)
tree1ea90370f8b0ad2fa983f902ab9d06de889f7d3f
parentf5ab14744a6abec6ece2a7aeab584278ddbeac78 (diff)
downloadmeta-openembedded-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.patch11
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 695dd97f6..e525047df 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>
35 build/moz.configure/init.configure | 31 +- 35 build/moz.configure/init.configure | 31 +-
36 build/moz.configure/keyfiles.configure | 4 +- 36 build/moz.configure/keyfiles.configure | 4 +-
37 build/moz.configure/old.configure | 32 +- 37 build/moz.configure/old.configure | 32 +-
38 build/moz.configure/toolchain.configure | 16 +- 38 build/moz.configure/toolchain.configure | 18 +-
39 build/moz.configure/util.configure | 9 +- 39 build/moz.configure/util.configure | 9 +-
40 build/moz.configure/windows.configure | 10 +- 40 build/moz.configure/windows.configure | 10 +-
41 build/templates.mozbuild | 2 +- 41 build/templates.mozbuild | 2 +-
@@ -451,6 +451,15 @@ index fc640c75e..c5508dfb7 100755
451 def pgo_flags(compiler): 451 def pgo_flags(compiler):
452 if compiler.type in ('gcc', 'clang'): 452 if compiler.type in ('gcc', 'clang'):
453 return namespace( 453 return namespace(
454@@ -1517,6 +1517,8 @@ def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_e
455 gold = check_cmd_output(*detection_cmd).strip()
456 if not gold:
457 return
458+ if isinstance(gold, bytes):
459+ gold = gold.decode('utf-8')
460
461 goldFullPath = find_program(gold)
462 if goldFullPath is None:
454diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure 463diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
455index 3284fd8b5..218813e2d 100644 464index 3284fd8b5..218813e2d 100644
456--- a/build/moz.configure/util.configure 465--- a/build/moz.configure/util.configure