[oe] [meta-oe][PATCH] mozjs: Fix gold linker detection with py3

Khem Raj raj.khem at gmail.com
Mon Feb 10 22:48:06 UTC 2020


Signed-off-by: Khem Raj <raj.khem at gmail.com>
Cc: Andreas Müller <schnitzeltony at gmail.com>
---
 .../mozjs/mozjs/python3_string_encoding.patch | 20 +++++++++++++++++++
 .../recipes-extended/mozjs/mozjs_60.9.0.bb    |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta-oe/recipes-extended/mozjs/mozjs/python3_string_encoding.patch

diff --git a/meta-oe/recipes-extended/mozjs/mozjs/python3_string_encoding.patch b/meta-oe/recipes-extended/mozjs/mozjs/python3_string_encoding.patch
new file mode 100644
index 0000000000..97eb012e83
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs/python3_string_encoding.patch
@@ -0,0 +1,20 @@
+Fixes python3 erros like below
+
+AttributeError: 'bytes' object has no attribute 'encode'
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+
+Index: firefox-60.9.0/build/moz.configure/toolchain.configure
+===================================================================
+--- firefox-60.9.0.orig/build/moz.configure/toolchain.configure
++++ firefox-60.9.0/build/moz.configure/toolchain.configure
+@@ -1518,7 +1518,7 @@ def enable_gnu_linker(enable_gold_option
+         if not gold:
+             return
+ 
+-        goldFullPath = find_program(gold)
++        goldFullPath = find_program(gold.decode())
+         if goldFullPath is None:
+             return
+ 
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
index 9466c62aac..b7731c7a2a 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb
@@ -19,6 +19,7 @@ SRC_URI = " \
     file://0012-JS_PUBLIC_API.patch \
     file://0013-riscv-Disable-atomic-operations.patch \
     file://0014-fallback-to-2011-C++-standard.patch \
+    file://python3_string_encoding.patch \
 "
 SRC_URI_append_libc-musl = " \
     file://musl/0001-support-musl.patch \
-- 
2.25.0



More information about the Openembedded-devel mailing list