| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 1a47eac590f57c765033c7797b0759dc314f2128 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Mon, 1 Nov 2021 22:52:57 +0100 |
| 4 | Subject: [PATCH] Do not check binaries after build |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | * It buys us a dependency hard to fulfill in different layer setups |
| 10 | * Mozjs-91 does not perform these checks when setting --enable-project=js. Here |
| 11 | for old configuration style --enable-project changes nothing and build wants |
| 12 | to check binaries created. |
| 13 | |
| 14 | So omit checks by not searching for llvm_objdump and making check_binary.py a |
| 15 | stub to prevent errors by using unset LLVM_OBJDUMP. |
| 16 | |
| 17 | Upstream-Status: Inappropriate [oe specific] |
| 18 | |
| 19 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 20 | --- |
| 21 | moz.configure | 7 ------- |
| 22 | python/mozbuild/mozbuild/action/check_binary.py | 2 +- |
| 23 | 2 files changed, 1 insertion(+), 8 deletions(-) |
| 24 | |
| 25 | diff --git a/moz.configure b/moz.configure |
| 26 | index 9b0e784..41e3e4d 100755 |
| 27 | --- a/moz.configure |
| 28 | +++ b/moz.configure |
| 29 | @@ -648,13 +648,6 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): |
| 30 | return (llvm_objdump,) |
| 31 | |
| 32 | |
| 33 | -llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump', |
| 34 | - when='--enable-compile-environment', |
| 35 | - paths=toolchain_search_path) |
| 36 | - |
| 37 | -add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump) |
| 38 | - |
| 39 | - |
| 40 | js_option('--enable-dtrace', help='Build with dtrace support') |
| 41 | |
| 42 | dtrace = check_header('sys/sdt.h', when='--enable-dtrace', |
| 43 | diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py |
| 44 | index 57ccfa6..bd2c167 100644 |
| 45 | --- a/python/mozbuild/mozbuild/action/check_binary.py |
| 46 | +++ b/python/mozbuild/mozbuild/action/check_binary.py |
| 47 | @@ -366,4 +366,4 @@ def main(args): |
| 48 | |
| 49 | |
| 50 | if __name__ == '__main__': |
| 51 | - sys.exit(main(sys.argv[1:])) |
| 52 | + sys.exit(0) |
| 53 | -- |
| 54 | 2.31.1 |
| 55 | |