* Re: [PATCH] mozjs-78: Get rid of erroneous dependency trying to satisfy llvm_objdump
[not found] <20211101224402.3949691-1-schnitzeltony@gmail.com>
@ 2021-11-02 6:32 ` Andreas Müller
[not found] ` <f70a72c4-5d10-57d1-429b-c4d613b606cd@gmail.com>
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Müller @ 2021-11-02 6:32 UTC (permalink / raw)
To: openembeded-devel
On Mon, Nov 1, 2021 at 11:44 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
Just saw this one did not make it to master-next. Is there an issue or
was it just overseen?
Asking because it should fix builds without meta-clang in layers
Andreas
>
> * 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>
> ---
> ...03-Do-not-check-binaries-after-build.patch | 55 +++++++++++++++++++
> ...04-Cargo.toml-do-not-abort-on-panic.patch} | 0
> ...bility-of-mozbuild-with-Python-3.10.patch} | 0
> ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 0
> ...-build.patch => 0007-fix-musl-build.patch} | 0
> .../{0007-riscv.patch => 0008-riscv.patch} | 0
> ...009-riscv-Disable-atomic-operations.patch} | 0
> ...h => 0010-riscv-Set-march-correctly.patch} | 0
> ...ce-include-by-code-to-fix-arm-build.patch} | 0
> ...redArrayRawBufferRefs-to-public-API.patch} | 0
> .../mozjs/mozjs-78_78.15.0.bb | 20 +++----
> 11 files changed, 65 insertions(+), 10 deletions(-)
> create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0003-Cargo.toml-do-not-abort-on-panic.patch => 0004-Cargo.toml-do-not-abort-on-panic.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0004-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch => 0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0005-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0006-fix-musl-build.patch => 0007-fix-musl-build.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0007-riscv.patch => 0008-riscv.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0008-riscv-Disable-atomic-operations.patch => 0009-riscv-Disable-atomic-operations.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0009-riscv-Set-march-correctly.patch => 0010-riscv-Set-march-correctly.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0010-replace-include-by-code-to-fix-arm-build.patch => 0011-replace-include-by-code-to-fix-arm-build.patch} (100%)
> rename meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/{0011-Add-SharedArrayRawBufferRefs-to-public-API.patch => 0012-Add-SharedArrayRawBufferRefs-to-public-API.patch} (100%)
>
> 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 000000000..a0f37f597
> --- /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
> +
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Cargo.toml-do-not-abort-on-panic.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Cargo.toml-do-not-abort-on-panic.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-use-asm-sgidefs.h.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-use-asm-sgidefs.h.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-fix-musl-build.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-fix-musl-build.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-riscv.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-riscv.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv-Disable-atomic-operations.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv-Disable-atomic-operations.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Set-march-correctly.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Set-march-correctly.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-replace-include-by-code-to-fix-arm-build.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-replace-include-by-code-to-fix-arm-build.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-Add-SharedArrayRawBufferRefs-to-public-API.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch
> similarity index 100%
> rename from meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-Add-SharedArrayRawBufferRefs-to-public-API.patch
> rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch
> 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 9aa7ed01d..090c2fe05 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
> @@ -7,15 +7,16 @@ SRC_URI = " \
> https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
> file://0001-rust.configure-Skip-all-target-manipulations.patch \
> file://0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \
> - file://0003-Cargo.toml-do-not-abort-on-panic.patch \
> - file://0004-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch \
> - file://0005-use-asm-sgidefs.h.patch \
> - file://0006-fix-musl-build.patch \
> - file://0007-riscv.patch \
> - file://0008-riscv-Disable-atomic-operations.patch \
> - file://0009-riscv-Set-march-correctly.patch \
> - file://0010-replace-include-by-code-to-fix-arm-build.patch \
> - file://0011-Add-SharedArrayRawBufferRefs-to-public-API.patch \
> + file://0003-Do-not-check-binaries-after-build.patch \
> + file://0004-Cargo.toml-do-not-abort-on-panic.patch \
> + file://0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch \
> + file://0006-use-asm-sgidefs.h.patch \
> + file://0007-fix-musl-build.patch \
> + file://0008-riscv.patch \
> + file://0009-riscv-Disable-atomic-operations.patch \
> + file://0010-riscv-Set-march-correctly.patch \
> + file://0011-replace-include-by-code-to-fix-arm-build.patch \
> + file://0012-Add-SharedArrayRawBufferRefs-to-public-API.patch \
> "
>
> SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151"
> @@ -25,7 +26,6 @@ DEPENDS = " \
> autoconf-2.13-native \
> icu-native \
> cargo-native \
> - ${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "clang-native", "llvm-native", d)} \
> zlib \
> python3-six \
> python3-six-native \
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [oe] [PATCH] mozjs-78: Get rid of erroneous dependency trying to satisfy llvm_objdump
[not found] ` <f70a72c4-5d10-57d1-429b-c4d613b606cd@gmail.com>
@ 2021-11-02 15:17 ` Andreas Müller
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Müller @ 2021-11-02 15:17 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Tue, Nov 2, 2021 at 3:23 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 11/1/21 11:32 PM, Andreas Müller wrote:
> > On Mon, Nov 1, 2021 at 11:44 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > Just saw this one did not make it to master-next. Is there an issue or
> > was it just overseen?
> >
>
> I squashed this into original patch.
Ah - OK thanks
Andreas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-02 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20211101224402.3949691-1-schnitzeltony@gmail.com>
2021-11-02 6:32 ` [PATCH] mozjs-78: Get rid of erroneous dependency trying to satisfy llvm_objdump Andreas Müller
[not found] ` <f70a72c4-5d10-57d1-429b-c4d613b606cd@gmail.com>
2021-11-02 15:17 ` [oe] " Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.