From 8f28d845b144d19d7894163e2ac84f98ea521f9c Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 12 Nov 2021 15:27:25 +0800 Subject: mozjs-91: fix do_configure failure do_configure fails occasionally with following error: | File "/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler | os.remove(path) | FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' change the temp file's prefix to avoid it is deleted by others Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- ...ure-fix-one-occasionally-reproduced-confi.patch | 50 ++++++++++++++++++++++ meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..5472eddbbb --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,50 @@ +From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 11 Nov 2021 16:05:54 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 8f35e89c73..84e256647d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): + "C++": ".cpp", + }[language] + +- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) ++ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) + try: + source = source.encode("ascii", "replace") + +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb index d6114b15aa..9150e18810 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb @@ -13,6 +13,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://riscv32.patch \ file://0005-nojit-32bit-arch-fix.patch \ file://0006-Fix-build-on-powerpc.patch \ + file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ " SRC_URI[sha256sum] = "3ef3cfd321d0c2c80ee1b41b8baf7a1ea4daf93c29e1377274933440ff5e42c3" -- cgit v1.2.3-54-g00ecf