diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-11-01 12:49:10 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-11-02 08:07:17 -0700 |
commit | 659b72bb1c891dc6b74a8dd770640c5997c3be2b (patch) | |
tree | f6ce0c0bcc91c8c3006c583694075f48420c14e5 /meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch | |
parent | eb8d2568d0b48f30fe39a6bbe4a59bf32107f3b5 (diff) | |
download | meta-openembedded-contrib-659b72bb1c891dc6b74a8dd770640c5997c3be2b.tar.gz |
mozjs-78: Initial add
* Did not get rid of checks using llvm-objdump. So depend either llvm-native
from oe-core or clang-native from meta-clang
* Unfortunately we still need python3-six(-native) although firefox ships a
version in third_party. If somebody more clever than me can solve this,
mozjs-78 can be moved out of dynamic-layers
* Get rid of erroneous dependency trying to satisfy llvm_objdump
It was tested improperly so configure faile for meta-clang not in layers
It is not necessary for building js only - see mozjs-91
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch')
-rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch new file mode 100644 index 0000000000..a0f37f597b --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch @@ -0,0 +1,55 @@ +From 1a47eac590f57c765033c7797b0759dc314f2128 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 1 Nov 2021 22:52:57 +0100 +Subject: [PATCH] Do not check binaries after build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* It buys us a dependency hard to fulfill in different layer setups +* Mozjs-91 does not perform these checks when setting --enable-project=js. Here + for old configuration style --enable-project changes nothing and build wants + to check binaries created. + +So omit checks by not searching for llvm_objdump and making check_binary.py a +stub to prevent errors by using unset LLVM_OBJDUMP. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + moz.configure | 7 ------- + python/mozbuild/mozbuild/action/check_binary.py | 2 +- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/moz.configure b/moz.configure +index 9b0e784..41e3e4d 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -648,13 +648,6 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): + return (llvm_objdump,) + + +-llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump', +- when='--enable-compile-environment', +- paths=toolchain_search_path) +- +-add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump) +- +- + js_option('--enable-dtrace', help='Build with dtrace support') + + dtrace = check_header('sys/sdt.h', when='--enable-dtrace', +diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py +index 57ccfa6..bd2c167 100644 +--- a/python/mozbuild/mozbuild/action/check_binary.py ++++ b/python/mozbuild/mozbuild/action/check_binary.py +@@ -366,4 +366,4 @@ def main(args): + + + if __name__ == '__main__': +- sys.exit(main(sys.argv[1:])) ++ sys.exit(0) +-- +2.31.1 + |