[oe-commits] [meta-openembedded] 04/08: mozjs: Fix python3 build with gold

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 89b9507d8954bcef8d5df13420dc217f98858815
Author: Andreas Müller <schnitzeltony at gmail.com>
AuthorDate: Tue Feb 11 00:22:15 2020 +0100

    mozjs: Fix python3 build with gold
    
    Fixes [1]
    
    [1] http://errors.yoctoproject.org/Errors/Details/390559/
    
    Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../mozjs/mozjs/0001-Port-build-to-python3.patch              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 695dd97..e525047 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 at 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.