diff options
| author | Changqing Li <changqing.li@windriver.com> | 2021-11-12 15:27:24 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-11-13 01:17:26 -0800 |
| commit | 3eb7478a4625926facc293a0d7282234cc1b77a3 (patch) | |
| tree | 87cb23a211f967ef10b66fd0aba7f1214064a770 /meta-oe | |
| parent | 973a4ebea660d8684dd56433767305ad1af48f39 (diff) | |
| download | meta-openembedded-3eb7478a4625926facc293a0d7282234cc1b77a3.tar.gz | |
mozjs-78: 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 <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
2 files changed, 51 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..e943cf1ba1 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-util.configure-fix-one-occasionally-reproduced-confi.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From 430fd956b91c6208f166753578234c2f5db6352f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 11 Nov 2021 21:17:38 +0800 | ||
| 4 | Subject: [PATCH] util.configure: fix one occasionally reproduced configure | ||
| 5 | failure | ||
| 6 | |||
| 7 | error: | ||
| 8 | | checking whether the C++ compiler supports -Wno-range-loop-analysis... | ||
| 9 | | DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: | ||
| 10 | | DEBUG: | int | ||
| 11 | | DEBUG: | main(void) | ||
| 12 | | DEBUG: | { | ||
| 13 | | DEBUG: | | ||
| 14 | | DEBUG: | ; | ||
| 15 | | DEBUG: | return 0; | ||
| 16 | | DEBUG: | } | ||
| 17 | | 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 | ||
| 18 | | DEBUG: The command returned non-zero exit status 1. | ||
| 19 | | DEBUG: Its error output was: | ||
| 20 | ... | ||
| 21 | | File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler | ||
| 22 | | os.remove(path) | ||
| 23 | | FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' | ||
| 24 | |||
| 25 | It should be another process that deleted this file by using | ||
| 26 | "rm -rf conftest*" inappropriately | ||
| 27 | |||
| 28 | Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] | ||
| 29 | |||
| 30 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 31 | --- | ||
| 32 | build/moz.configure/util.configure | 2 +- | ||
| 33 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 34 | |||
| 35 | diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure | ||
| 36 | index 7ee1a498ad..511e257ad9 100644 | ||
| 37 | --- a/build/moz.configure/util.configure | ||
| 38 | +++ b/build/moz.configure/util.configure | ||
| 39 | @@ -217,7 +217,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): | ||
| 40 | 'C++': '.cpp', | ||
| 41 | }[language] | ||
| 42 | |||
| 43 | - fd, path = mkstemp(prefix='conftest.', suffix=suffix, text=True) | ||
| 44 | + fd, path = mkstemp(prefix='try_invoke_compiler_conftest.', suffix=suffix, text=True) | ||
| 45 | try: | ||
| 46 | source = source.encode('ascii', 'replace') | ||
| 47 | |||
| 48 | -- | ||
| 49 | 2.17.1 | ||
| 50 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb index 61c5861153..c8fe8bbfab 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb | |||
| @@ -17,6 +17,7 @@ SRC_URI = " \ | |||
| 17 | file://0010-riscv-Set-march-correctly.patch \ | 17 | file://0010-riscv-Set-march-correctly.patch \ |
| 18 | file://0011-replace-include-by-code-to-fix-arm-build.patch \ | 18 | file://0011-replace-include-by-code-to-fix-arm-build.patch \ |
| 19 | file://0012-Add-SharedArrayRawBufferRefs-to-public-API.patch \ | 19 | file://0012-Add-SharedArrayRawBufferRefs-to-public-API.patch \ |
| 20 | file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151" | 23 | SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151" |
