From patchwork Wed Sep 14 12:03:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12844 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0E19ECAAD3 for ; Wed, 14 Sep 2022 12:03:33 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.5405.1663157004722513121 for ; Wed, 14 Sep 2022 05:03:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oIDuIQzJ; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id k9so25401904wri.0 for ; Wed, 14 Sep 2022 05:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=wK/efcpCu/VRNJBS+8k4lWXfW2KqJQ4ReB39b/fNW+w=; b=oIDuIQzJeDP5Ncuk9fWjnLAqAYqKhD/dBYi+dblK5s8v9xlvLHMFmxStjGwyFs7YSk TbSAO4nWaxF+HHRgQJJeANdjcTUAS3nD97y4udmwPXyFj+BkC6nPFLyk7KEol5DZpsjd FXPYAX1fQII8QRbhqLb4moLMVkybG+P0KES/pe8yfrwGaE7CLDzyh8JgxbKG8KYquDmj eIgecOeM6q9HAshe4ceC0FEqANM2pF3Hhl1IxW+sulGkifIgm0ym5dV4KrVnaqKsnW6N YfCL1Aw4mz+qPTlR0m5Ccmco6zDm4fq0Re+iLPQmGRxuByCBVQlRwpKWeWGKYNiAM46y ERGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=wK/efcpCu/VRNJBS+8k4lWXfW2KqJQ4ReB39b/fNW+w=; b=KnKw4ixbX/2xkweSWqcHi/TNAUodCF1UwkJoUrkYq8NOUd7M7CHTIjRWc4MxjVbNtB e+D/zoCEpnLwuyaDPHZdSPfPxnt2o/CaVXShhocIxZEUkb9wgZfFC2EHl1jr9B5FMMfP +0o5LihVayQ58ovQ5MYvfFv4KD2KRjpymPUozrIGOHt9t4cMRoLHd/DK0mfH4aqz9cba gh4H3lkti2mU7vhug9U7KvsSXmtPmd/Rne1z5L4dPGNfHfVVt3JxLBK0HxgNzsyjC2yx v0FujGT72GR4KWOVLynnNJ3OMvjyGSy6+qJNP/uQCP1OYh+x3ZUg67xtqJeXBzQhr649 7FMg== X-Gm-Message-State: ACgBeo09DaIloXPEjIcOgAL549jb8pIE9Nj0vx+BoiCZTd+bDOGA7s/c RFSSVanBKHxT39eyocB7S2QJdpjrxvq0Hg== X-Google-Smtp-Source: AA6agR545lOWOXpWSgz8vvb91KzNn17Ay8XmfuUGqX52+UWSS8CQfn2pjsRl3MGQ2MkBA//pJewtvg== X-Received: by 2002:a05:6000:1a8e:b0:22a:c2ce:f556 with SMTP id f14-20020a0560001a8e00b0022ac2cef556mr3829985wry.154.1663157002921; Wed, 14 Sep 2022 05:03:22 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:19 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/8] mozjs-91: update to 91.13.0 Date: Wed, 14 Sep 2022 14:03:09 +0200 Message-Id: <20220914120316.551377-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98795 Signed-off-by: Alexander Kanavin --- .../mozjs/{mozjs-91_91.8.0.bb => mozjs-91_91.13.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-extended/mozjs/{mozjs-91_91.8.0.bb => mozjs-91_91.13.0.bb} (96%) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb similarity index 96% rename from meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb rename to meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb index 8ade3bb4b..c3ee75086 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb @@ -16,7 +16,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ " -SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a" +SRC_URI[sha256sum] = "53be2bcde0b5ee3ec106bd8ba06b8ae95e7d489c484e881dfbe5360e4c920762" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" From patchwork Wed Sep 14 12:03:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B88EC6FA8E for ; Wed, 14 Sep 2022 12:03:34 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web09.5281.1663157007033181157 for ; Wed, 14 Sep 2022 05:03:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=q3xstD/8; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id bz13so25359776wrb.2 for ; Wed, 14 Sep 2022 05:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=hiQ3FwrnUE3Q0p8nRoUSDU8oUiJufcXHxvilsmXPsXs=; b=q3xstD/820I/+9EZqW+uK1fbSytv6NHuQLydNNDUWkxfP1MFoAdBMLTUEICjFeQKr2 f3U/f4xLaxfPtx0dZpFyI5L/jiMp49QTtmXaNzWYohT1nGT+kzgwk2FjItrQwx8TX7BX bE1byRjlvZ1u9oZGUkggn1LTR6ApZCRsLUUqSzlk+UHP99tD7NLqzpT2EWR4EXPx5C+J o4gZdGxlbNuK2YBksozFQ9/CBdioMaD13uGig8ar6CLhYdwyKQZpFY9bXhtLqMwMzoqf 10nUSeMp+sjFgROuy/6KAw03LTY9FRZNi5Lo2DwQGMSbd/VGuuzQ9ZwAgiMTrmRJcDhz mBow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=hiQ3FwrnUE3Q0p8nRoUSDU8oUiJufcXHxvilsmXPsXs=; b=vVhavbUwgizuiiN7o9NupttlI12BxWssrsgBuYYDVeemFtuAXEFxlFgkvx8JNlukGu cCPrr6IK/oBFYqpHjWc65v6xKE82JOHoomA2U6/wdhdP1G6qw6QxUt2PygiHkRmPx/sy B/3NghTIlC5HZ1C8mDLC326KRzJgjbi+eX8/F/D68Pb1ecGnWg71NvnIeWWFxP499EZq E1Ba77QDCECWKnFz+ZOloVO2xo7z88V5lJQfEOMNEj4g/RwZMI4GFy+lziW6hSxWM0Kv WSpkU3+Nm8r/iUtvzoVjqfrKkF6Ws80MOjYDUxNuin0KGprFpzp7DQZb+s0lIAUZhNFm DONA== X-Gm-Message-State: ACgBeo2k4PAgGAS01ZsZ3/FIpF7A0ycwewidM3S5BU7O6ci2K3IQJ8nH W3ccHurCRpNNf9agpoSXLYAyQvFVP9ONcw== X-Google-Smtp-Source: AA6agR5oQYDzyJuLsa1AJKMX3OMjXTTu1FqJM9CPj4kSoELddWYkRkiUI8cBMdg+f3H2xZ1z2zqCKA== X-Received: by 2002:adf:fd05:0:b0:22a:292f:1908 with SMTP id e5-20020adffd05000000b0022a292f1908mr19084574wrr.85.1663157005378; Wed, 14 Sep 2022 05:03:25 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:23 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/8] mozjs-91: backport a python 3.11 compatibility patch Date: Wed, 14 Sep 2022 14:03:10 +0200 Message-Id: <20220914120316.551377-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98796 Signed-off-by: Alexander Kanavin --- .../mozjs/mozjs-91/py-3.11.patch | 211 ++++++++++++++++++ .../mozjs/mozjs-91_91.13.0.bb | 1 + 2 files changed, 212 insertions(+) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch new file mode 100644 index 000000000..71da8225a --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch @@ -0,0 +1,211 @@ + +# HG changeset patch +# User ahochheiden +# Date 1654151264 0 +# Node ID f54162b2c1f2fe52c6137ab2c3469a1944f58b27 +# Parent 6e7776492240c27732840d65a33dcc440fa1aba0 +Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium + +The 'U' flag represents "universal newline". It has been deprecated +since Python3.3. Since then "universal newline" is the default when a +file is opened in text mode (not bytes). In Python3.11 using the 'U' +flag throws errors. There should be no harm in removing 'U' from 'open' +everywhere it is used, and doing allows the use of Python3.11. + +For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Differential Revision: https://phabricator.services.mozilla.com/D147721 + +Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/f54162b2c1f2fe52c6137ab2c3469a1944f58b27] +Signed-off-by: Alexander Kanavin + +diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py +--- a/dom/base/usecounters.py ++++ b/dom/base/usecounters.py +@@ -3,17 +3,17 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + import collections + import re + + + def read_conf(conf_filename): + # Can't read/write from a single StringIO, so make a new one for reading. +- stream = open(conf_filename, "rU") ++ stream = open(conf_filename, "r") + + def parse_counters(stream): + for line_num, line in enumerate(stream): + line = line.rstrip("\n") + if not line or line.startswith("//"): + # empty line or comment + continue + m = re.match(r"method ([A-Za-z0-9]+)\.([A-Za-z0-9]+)$", line) +diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py +--- a/python/mozbuild/mozbuild/action/process_define_files.py ++++ b/python/mozbuild/mozbuild/action/process_define_files.py +@@ -31,17 +31,17 @@ def process_define_file(output, input): + + config = PartialConfigEnvironment(topobjdir) + + if mozpath.basedir( + path, [mozpath.join(topsrcdir, "js/src")] + ) and not config.substs.get("JS_STANDALONE"): + config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) + +- with open(path, "rU") as input: ++ with open(path, "r") as input: + r = re.compile( + "^\s*#\s*(?P[a-z]+)(?:\s+(?P\S+)(?:\s+(?P\S+))?)?", re.U + ) + for l in input: + m = r.match(l) + if m: + cmd = m.group("cmd") + name = m.group("name") +diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py +--- a/python/mozbuild/mozbuild/backend/base.py ++++ b/python/mozbuild/mozbuild/backend/base.py +@@ -267,17 +267,17 @@ class BuildBackend(LoggingMixin): + If an exception is raised, |mach build| will fail with a + non-zero exit code. + """ + self._write_purgecaches(config) + + return status + + @contextmanager +- def _write_file(self, path=None, fh=None, readmode="rU"): ++ def _write_file(self, path=None, fh=None, readmode="r"): + """Context manager to write a file. + + This is a glorified wrapper around FileAvoidWrite with integration to + update the summary data on this instance. + + Example usage: + + with self._write_file('foo.txt') as fh: +diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py +--- a/python/mozbuild/mozbuild/preprocessor.py ++++ b/python/mozbuild/mozbuild/preprocessor.py +@@ -526,17 +526,17 @@ class Preprocessor: + if not options.output: + raise Preprocessor.Error( + self, "--depend doesn't work with stdout", None + ) + depfile = get_output_file(options.depend) + + if args: + for f in args: +- with io.open(f, "rU", encoding="utf-8") as input: ++ with io.open(f, "r", encoding="utf-8") as input: + self.processFile(input=input, output=out) + if depfile: + mk = Makefile() + mk.create_rule([six.ensure_text(options.output)]).add_dependencies( + self.includes + ) + mk.dump(depfile) + depfile.close() +@@ -855,17 +855,17 @@ class Preprocessor: + self.checkLineNumbers = False + if isName: + try: + args = _to_text(args) + if filters: + args = self.applyFilters(args) + if not os.path.isabs(args): + args = os.path.join(self.curdir, args) +- args = io.open(args, "rU", encoding="utf-8") ++ args = io.open(args, "r", encoding="utf-8") + except Preprocessor.Error: + raise + except Exception: + raise Preprocessor.Error(self, "FILE_NOT_FOUND", _to_text(args)) + self.checkLineNumbers = bool( + re.search("\.(js|jsm|java|webidl)(?:\.in)?$", args.name) + ) + oldFile = self.context["FILE"] +@@ -909,17 +909,17 @@ class Preprocessor: + + def do_error(self, args): + raise Preprocessor.Error(self, "Error: ", _to_text(args)) + + + def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): + pp = Preprocessor(defines=defines, marker=marker) + for f in includes: +- with io.open(f, "rU", encoding="utf-8") as input: ++ with io.open(f, "r", encoding="utf-8") as input: + pp.processFile(input=input, output=output) + return pp.includes + + + # Keep this module independently executable. + if __name__ == "__main__": + pp = Preprocessor() + pp.handleCommandLine(None, True) +diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py +--- a/python/mozbuild/mozbuild/util.py ++++ b/python/mozbuild/mozbuild/util.py +@@ -231,17 +231,17 @@ class FileAvoidWrite(BytesIO): + enabled by default because it a) doesn't make sense for binary files b) + could add unwanted overhead to calls. + + Additionally, there is dry run mode where the file is not actually written + out, but reports whether the file was existing and would have been updated + still occur, as well as diff capture if requested. + """ + +- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): ++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): + BytesIO.__init__(self) + self.name = filename + assert type(capture_diff) == bool + assert type(dry_run) == bool + assert "r" in readmode + self._capture_diff = capture_diff + self._write_to_file = not dry_run + self.diff = None +diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py +--- a/python/mozbuild/mozpack/files.py ++++ b/python/mozbuild/mozpack/files.py +@@ -549,17 +549,17 @@ class PreprocessedFile(BaseFile): + self.defines = defines + self.extra_depends = list(extra_depends or []) + self.silence_missing_directive_warnings = silence_missing_directive_warnings + + def inputs(self): + pp = Preprocessor(defines=self.defines, marker=self.marker) + pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) + +- with _open(self.path, "rU") as input: ++ with _open(self.path, "r") as input: + with _open(os.devnull, "w") as output: + pp.processFile(input=input, output=output) + + # This always yields at least self.path. + return pp.includes + + def copy(self, dest, skip_if_older=True): + """ +@@ -606,17 +606,17 @@ class PreprocessedFile(BaseFile): + return False + + deps_out = None + if self.depfile: + deps_out = FileAvoidWrite(self.depfile) + pp = Preprocessor(defines=self.defines, marker=self.marker) + pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) + +- with _open(self.path, "rU") as input: ++ with _open(self.path, "r") as input: + pp.processFile(input=input, output=dest, depfile=deps_out) + + dest.close() + if self.depfile: + deps_out.close() + + return True + + diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb index c3ee75086..4c1aa3447 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0006-Fix-build-on-powerpc.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ + file://py-3.11.patch \ " SRC_URI[sha256sum] = "53be2bcde0b5ee3ec106bd8ba06b8ae95e7d489c484e881dfbe5360e4c920762" From patchwork Wed Sep 14 12:03:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12846 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0930EC6FA8B for ; Wed, 14 Sep 2022 12:03:34 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web09.5282.1663157008321976338 for ; Wed, 14 Sep 2022 05:03:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WmlnPFwt; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id bz13so25359869wrb.2 for ; Wed, 14 Sep 2022 05:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=O8zzhDrAGlZUdtTBLoPA1WkDS9nNTqVcJx2faWsmw8c=; b=WmlnPFwtaxifv0ZzFNIUAm9dqXiWSwTySo6DuoR/h3ZFgCDfk8xKujDvGmU0/Qo0FT CRtAqu0v6f7HuvyEr5coltDtfYMaUABdVjpu7dcoZHNEV5vFBbBxI9pX6g3tB5zKDX8V 20dVCgpriewOlXhka2S+SpCBDU9CMTl4z7HXbbOYXW/oJGqNDbYbgqqa0lAuaN6OvJFQ jOI2XUMYu9S+lrWwL1zPbK3uSVyRy/PVaUohrJslQ98rEmT08289YSUqqWzHlmTWYGoD S9uINIfIrJdAZ0neebMuaj/fwMUkyKJuKbdiQCH/6GkoWxEZI2Ry/B1sbMBTUcQRlT/H 7FtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=O8zzhDrAGlZUdtTBLoPA1WkDS9nNTqVcJx2faWsmw8c=; b=RLMNqujq1HFKkkUOEAaecSW8KFE/brkfwBGtsUSKZYFXEhShcQEKyVuPLweBBcvWs1 rbnIz+YGh7EBfw0/eh7yu0vbvJbn/6sh/HCnt8C0oFJZ3SR3w3shRS42hUSRy3p6V4XQ bLMC6VZcu8GH9M+61iNxdPCOqXyp+XTOn/7c+1O7l7U26IGlTf3SpmZJ5dk3lOw9j4Ke hdfF3lCNcUNg1KJVHczyr3kgnpT+ysxcaK76wyVeNKGejKZargvfMSUQjTW4V/qk59WV H65LLqe+VJvD7BAV7cfo7mRS7UxXQql2m2HsBRypK/FywL9mQ6C5IzqGoq4v03vhPPLk wQlw== X-Gm-Message-State: ACgBeo22CBaY3V8cDeKcLrliyTMyRYpIIJ5mgFpfMNZzmjgUn/RH9Kq6 3fOT3EfK2vG+JU9BHxxbDCh4lxcAPKe4yQ== X-Google-Smtp-Source: AA6agR4482K7HpMy+g7LH32ZG5w1Hz5d4GoyTB/Yp4hgHATq3t66DtFmeefIIG3b9TU/RnQrhIiKWw== X-Received: by 2002:a05:6000:811:b0:22a:2856:9418 with SMTP id bt17-20020a056000081100b0022a28569418mr19353209wrb.46.1663157006873; Wed, 14 Sep 2022 05:03:26 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:25 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/8] zbar: disable python3 support as incompatible with py 3.11 Date: Wed, 14 Sep 2022 14:03:11 +0200 Message-Id: <20220914120316.551377-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98797 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-support/zbar/zbar_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb index 17084f830..3be1f27a6 100644 --- a/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-oe/recipes-support/zbar/zbar_git.bb @@ -24,7 +24,7 @@ PACKAGECONFIG ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " -PACKAGECONFIG ??= "video python3" +PACKAGECONFIG ??= "video" inherit autotools pkgconfig gettext \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ From patchwork Wed Sep 14 12:03:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09547C6FA8D for ; Wed, 14 Sep 2022 12:03:34 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.5319.1663157009564219190 for ; Wed, 14 Sep 2022 05:03:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UCXam4Cb; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id e16so25354631wrx.7 for ; Wed, 14 Sep 2022 05:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=//M4UTVtlbNfqCHG6knPNwRikyy9zS3iU4SutMN9qqI=; b=UCXam4CbJBi/v3O3hi4J7yfer28KcOrWaIyNMTT1H78iN7OiopC9Ffo9u/nrkxDV6z ipODQy4dPBmXZWgrYnRAojO4UZnRIk4xu3WPH+2qk1vEQA1DPSI/11UOx0EXTPb7jIRb SVwBt9UYBMHq75DEJXA8svkRW1CKk9pGLjH0PROM/r6CuTcNMpXreY01SkvfsVPbTDOM 8eGo9vZlq4gRw3Y+4sCez8yRZNtsk3m8cWYmVr31PAV26xSWkIYAq91QXzrCVV+N3Yd9 Oc3XxdTCWwweJf6j8Y26RjorvmaomPvrM52svReFc/xWyARprnW2dXdr/kdQR+j0vmtX qljQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=//M4UTVtlbNfqCHG6knPNwRikyy9zS3iU4SutMN9qqI=; b=IhFP2RKx+gfpBbjIE3ZakMSzBMHvy3qnvKkt3nU2xeka8Blg7Kifoyh7v4eMnZS3A9 jfnAmWYItlFmQySEQTjlI/MNjxDCamFP+zU+Ll9/JjHfUny30gV6vg/jJMhm9UFnEAKo lAojEG3MAcz/VUc4kXs5mSAKAd546a4jmayS6l6uLmnN2/L4SSoP5oqLOEyfBI712CZm bvdX+Nn0j3VJYComqtXxXEuLEBqzNAV3tQSzVLUhMhueciK74qwFMp6jBQllJOJcbXY0 afS/m68U/VqpBn9YX2vqwvkX+q9DaCD0/InVYWc/3ZaA1h2nCWpFGsmlQP1y6KX/ZakX VsIQ== X-Gm-Message-State: ACgBeo0VCxQU4wGkzn7JHPg0nfqKXVcDBaNevhGyU88jFyJOB9u4tW2t KI8SGvjf+XCxBQvR4XqC8PKKVyoQjbXTxA== X-Google-Smtp-Source: AA6agR6lJRTpUpuNdIofR4vL62n4yz7bH/yyoFiow5NUE10VZN6KRXCTiEz8lTar4+PGB95K2I4lPg== X-Received: by 2002:a5d:6b49:0:b0:225:6e92:22f5 with SMTP id x9-20020a5d6b49000000b002256e9222f5mr20157248wrw.529.1663157008007; Wed, 14 Sep 2022 05:03:28 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:27 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/8] minifi-cpp: disable python support as incompatible with python 3.11 Date: Wed, 14 Sep 2022 14:03:12 +0200 Message-Id: <20220914120316.551377-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98798 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 3d40bf857..b843f72a5 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -58,6 +58,7 @@ EXTRA_OECMAKE += " \ -DSKIP_TESTS=ON \ -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ + -DDISABLE_PYTHON_SCRIPTING=ON \ " EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" From patchwork Wed Sep 14 12:03:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0E53C6FA82 for ; Wed, 14 Sep 2022 12:03:33 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web12.5440.1663157011015116070 for ; Wed, 14 Sep 2022 05:03:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WcrZUvCv; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id bj14so25305365wrb.12 for ; Wed, 14 Sep 2022 05:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=UYtigN06+hDyM0qV4OYLYmDS+ZCMgWyzAd3Yn2LLEUs=; b=WcrZUvCvAXcvPA8SRmto/XAK8LB20bgSgqImUfpXGSFVOMBKaD/G5/bGb+u2JTt76X 2Q+XJgKKDlExedmx97cVFBi0wOZKmdwVmcGMw+PnCNoFVNdjI516EzFVck0B/T5QaFas uoQhqDbSal42CwT1xd6E89VqywSDhBA7rK/CmV8tYTbFH7tMZfRyXQ+10AT53VB80Tn/ VFEAsWJgPJpDnLoBrBWpb7/Ty+9M8eMa2MhKz3rPg0nzqjQMVoy8UnLN0hzt5w3GutzC pjgasX8xts60VahNepbfIwj/VytdWbMutT3x0VmF3mYl6Dl5Ezq8oJTeIy91Fx3q1Ly/ xIAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=UYtigN06+hDyM0qV4OYLYmDS+ZCMgWyzAd3Yn2LLEUs=; b=rChsqRA9PPQtzfRkI+EFCbCr0dWZSCkNmzPz3s4EXTDUtpjsou5E9MOWpK8MTnX5gz GAyp21BD6fTqSc10PNzs8B3l2oFJVFRKKZf8ARhf0dNvMN/jU9tLse5nXPm4IbSKTjTW rjZogfnml0sOooS5H4zFCFdqt4/7CPwLX3NWAR6bIr8PrudITEESvHN//aNTnvZJ0x+Z dxroPk/q5QzfTz3YsAd9h1SXhOAQuwxj+ypAx8wentXJHO0DtXk+n3rr8MN5N0qgu0XJ tBcOlgYc7PqK/HteRKOjCaZ65+N3Kq/nVfRhLFJS0uBJvq8n5FW3+WmctgkvfWLdAw5J AqrA== X-Gm-Message-State: ACgBeo3viqEYhVEXR5EZeXPvAeMeKRuzSptZPV8O6c+dldCbbImpiVzS V6CZ+xkB+doY1fyKLETwBrDtfBNBEJQnYw== X-Google-Smtp-Source: AA6agR6pZ2aV08KyvVmUTHdpI/HWtT+kzAEuUHq3NisrAS4O6DmGPqafMcut7Wr83NcKYyhQ9oXr1Q== X-Received: by 2002:a05:6000:15c6:b0:228:de49:dade with SMTP id y6-20020a05600015c600b00228de49dademr21112448wry.28.1663157009372; Wed, 14 Sep 2022 05:03:29 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:28 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/8] libsigrockdecode: add python 3.11 compatibility Date: Wed, 14 Sep 2022 14:03:13 +0200 Message-Id: <20220914120316.551377-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98799 Signed-off-by: Alexander Kanavin --- .../0001-configure.ac-add-py-3.10-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch index 85e49cca2..a90f588d2 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch +++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch @@ -1,7 +1,7 @@ From a5835dfe126bfe6ed0b8197c6578960835bf1fe8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 3 Oct 2021 22:08:50 +0200 -Subject: [PATCH] configure.ac: add py 3.10 support +Subject: [PATCH] configure.ac: add py 3.10/11 support Upstream-Status: Pending Signed-off-by: Alexander Kanavin @@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build SR_PKG_CHECK([python3], [SRD_PKGLIBS], - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) -+ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) AS_IF([test "x$sr_have_python3" = xno], [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) From patchwork Wed Sep 14 12:03:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 005E8ECAAD8 for ; Wed, 14 Sep 2022 12:03:34 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web09.5284.1663157011809966311 for ; Wed, 14 Sep 2022 05:03:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gWB+aYGq; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id b5so25304029wrr.5 for ; Wed, 14 Sep 2022 05:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=2gf23jIMdUqDZOzttTsb1ysLynrgL8yHdpUZd5hNCAw=; b=gWB+aYGqLXdAh7Gep4AWBunsh2p3RLN0LKamQ76706sGDVT1DZQdzWLh05O6oZBqMZ nrfeqGN3blvuE2fkW+llCm+FpXwlrE6oQkFX5Nt1m07WCEPhZgZfR7/8LV6IPBjgjSGy kCJwGb1cKRH+MEhKFBkDj5fPufpMYCQIVQvj8D9Y54pmsfYOu9jPdHtFj/YGMnJ/sRdN S8a8nFhkF5yysXaLys6AXvleZymxcL9LiQyZiJ/3cl8l5U0+1YfJA9EPtNSeqxvrHUdX G30+dCcMxE6XH/JjQ3f5vfjzARgtWPGfxUwDxsbeERo2PhstzFkIV1PR/gdQloFxglGY 2XOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=2gf23jIMdUqDZOzttTsb1ysLynrgL8yHdpUZd5hNCAw=; b=mRSK7YXk0Qa/4nY6LuuV66joS/UVgd33h6fnF4j4O9eecOkfMHiKgIrCBkNuN+BbnG OgiuGBIBQuVYGObuC34c/pcfqroohHoSrSG69I5U5S9Y2YXU1Btu8G7BK8du9N3j6n50 bNa79qXVLf1Yqv7wzgN41GjMAtuyn+mfb5ABXYFVJP6bTJHXQhMAmoaCjyp5YTEsyF+G iTYNWvR7dXfYwCuUmgHRdV/ywkFh+4+mXRCkbDVCVOjGxCQvqoZMbi7OBZYDPLx+FGzU iHSlGTCJWLrWNTHCZ3imSOGrLFBesb6qxGQyLFpY8aS6ACc0hW0tbWSr07ICY398RHRq 8RIg== X-Gm-Message-State: ACgBeo0tKKldK/iiO4BcZDhy6LnRB8/uejH+nFBUsKDs6AukXwLOkqnS fLlfbcr7gpFKKHsP54GGDPiEU1jbbP3kVw== X-Google-Smtp-Source: AA6agR5fdo5ttmu9VdXjA2Bi2oAlMGAPhVqbvP00EJSKYdVKjReH3LH0/2jxyydC+ZXdRbCkNLJZ4w== X-Received: by 2002:adf:e78b:0:b0:228:614c:33a6 with SMTP id n11-20020adfe78b000000b00228614c33a6mr19962351wrm.504.1663157010214; Wed, 14 Sep 2022 05:03:30 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:29 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/8] collectd: add a python PACKAGECONFIG, off by default Date: Wed, 14 Sep 2022 14:03:14 +0200 Message-Id: <20220914120316.551377-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98800 This resolves python 3.11 errors as well. Signed-off-by: Alexander Kanavin --- meta-oe/recipes-extended/collectd/collectd_5.12.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index dd97796f4..5dc64588d 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -51,6 +51,7 @@ PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasma PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --without-libldap, openldap" PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool" PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdcached" +PACKAGECONFIG[python] = "--enable-python,--disable-python" EXTRA_OECONF = " \ ${FPLAYOUT} \ From patchwork Wed Sep 14 12:03:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E13F7ECAAD3 for ; Wed, 14 Sep 2022 12:03:43 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web12.5441.1663157013976349112 for ; Wed, 14 Sep 2022 05:03:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=euhlTFBP; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id cc5so15506539wrb.6 for ; Wed, 14 Sep 2022 05:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=GcE9Si1QTx21vfwQ3umLXcVO6JL3CIfYj5VTW2NgIbI=; b=euhlTFBPthbkS5vfmFn37u5GdeD+/LHWVWW4puGh4G0g8pU8ChIXEix0ho1soFKBko DPVxFeum1vQMPPdAvXoPuPj6NwS4Vh6erz6TPMmjpcYlgoZmXOBV4le0U8oBTl9MuhTN s9vDWYC7PHotxhE3Z6rQLPkzgSCoWrXAIM/oleEGUK7hCZa8MbidLy07zQQA+5JACGO2 xvwvRPiIXIpiCIOhtgkKrucBVx7/ij2Q3iHvvlS10RPRKdzs0+OvCf83AUnkOanlReOz 9POUIY+9wm55lIDCKnzguTnZ5epv35uR7d5UbWP9J4trI2ILTDCG1Vaau8457R+LMFjZ gFnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=GcE9Si1QTx21vfwQ3umLXcVO6JL3CIfYj5VTW2NgIbI=; b=HssfIU06enaFaU9QI7V066H153UqDDlF32jXVU/1k6MpjttNT03dHZIDv/eFQf5X4J iBUBkRUjyaA2rwxSdsFeAFoau/b0985I26hyLxeIsQJkLXyoiJvSS7F29MokTRviyOQU yXq48YEThj8RN5GPpx/v3jx02hHsE1YMqs9eI34CnByhMQxCeE9rNFIbry6KxWAGQC8Q C0SAf/aS/NvmzUrWUKZ3gVgkocIZsLdw1lxiRK3vAgHXC/tfKGbmLqzhYryZPITECh4C UY83+kwbr6/6HW/0JBffoFteLpSgRqQN6BihTCYV7PopcVrmdq7mvO/Bv7cF52oUiJXq ElyA== X-Gm-Message-State: ACgBeo1xf3njXncNGM/LFG/nEwfIRH3FNQAH3VnLS0LqZyz4sATaPDDa g527fBlroyo61AA4CLi1yQpJoTVMfhIr5w== X-Google-Smtp-Source: AA6agR6zTkfyVdrUWEP1kBRgIYU6pvZdIhMxdljeGE/W6tfQmZT9vbZ4dOD40nh44eC4HNR9HDeOAg== X-Received: by 2002:a05:6000:1a8e:b0:22a:c2ce:f556 with SMTP id f14-20020a0560001a8e00b0022ac2cef556mr3830541wry.154.1663157011711; Wed, 14 Sep 2022 05:03:31 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:31 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/8] mozjs-78: remove the recipe Date: Wed, 14 Sep 2022 14:03:15 +0200 Message-Id: <20220914120316.551377-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98801 Nothing is depending on it, and mozjs-78 has been EOL for a while. Signed-off-by: Alexander Kanavin --- ...figure-Skip-all-target-manipulations.patch | 66 ---- ...-autoconf-s-config.sub-to-canonicali.patch | 33 -- ...03-Do-not-check-binaries-after-build.patch | 55 ---- ...004-Cargo.toml-do-not-abort-on-panic.patch | 33 -- ...ibility-of-mozbuild-with-Python-3.10.patch | 304 ------------------ .../mozjs-78/0006-use-asm-sgidefs.h.patch | 35 -- .../mozjs/mozjs-78/0007-fix-musl-build.patch | 15 - .../mozjs/mozjs-78/0008-riscv.patch | 52 --- ...0009-riscv-Disable-atomic-operations.patch | 52 --- .../0010-riscv-Set-march-correctly.patch | 60 ---- ...ace-include-by-code-to-fix-arm-build.patch | 43 --- ...aredArrayRawBufferRefs-to-public-API.patch | 35 -- ...ix-one-occasionally-reproduced-confi.patch | 50 --- ...rewrite-cargo-host-linker-in-python3.patch | 56 ---- .../mozjs/mozjs-78_78.15.0.bb | 146 --------- 15 files changed, 1035 deletions(-) delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch deleted file mode 100644 index 453174e51..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rust.configure-Skip-all-target-manipulations.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b75661fbddd00ba9a43680c35b8c08aad8807d6b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 31 Oct 2021 16:49:55 +0100 -Subject: [PATCH] rust.configure: Skip all target manipulations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Mozjs/rust targets are different from OE-rust targets. Use targets reported -as is. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller ---- - build/moz.configure/rust.configure | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index e5122d6..9f3cc91 100644 ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -81,9 +81,6 @@ def unwrap_rustup(prog, name): - - return unwrap - --rustc = unwrap_rustup(rustc, 'rustc') --cargo = unwrap_rustup(cargo, 'cargo') -- - - set_config('CARGO', cargo) - set_config('RUSTC', rustc) -@@ -239,6 +236,7 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): - @imports(_from='textwrap', _import='dedent') - def rust_target(rustc, host_or_target, compiler_info, - rust_supported_targets, arm_target): -+ return host_or_target.alias - # Rust's --target options are similar to, but not exactly the same - # as, the autoconf-derived targets we use. An example would be that - # Rust uses distinct target triples for targetting the GNU C++ ABI -@@ -401,22 +399,10 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): - - return rust_target - -- - rust_target_triple = rust_triple_alias(target, c_compiler) - rust_host_triple = rust_triple_alias(host, host_c_compiler) - - --@depends(host, rust_host_triple, rustc_info.host) --def validate_rust_host_triple(host, rust_host, rustc_host): -- if rust_host != rustc_host: -- if host.alias == rust_host: -- configure_host = host.alias -- else: -- configure_host = '{}/{}'.format(host.alias, rust_host) -- die("The rust compiler host ({}) is not suitable for the configure host ({})." -- .format(rustc_host, configure_host)) -- -- - set_config('RUST_TARGET', rust_target_triple) - set_config('RUST_HOST_TARGET', rust_host_triple) - --- -2.31.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch deleted file mode 100644 index 21ad82ede..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0002-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 7 Oct 2021 12:44:18 +0200 -Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' - names - -The outcome is that processed names no longer match our custom rust -target definitions, and the build fails. - -Upstream-Status: Inappropriate [oespecific] - -Signed-off-by: Alexander Kanavin -Signed-off-by: Andreas Müller ---- - build/moz.configure/init.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index b887153..0a6a33c 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -808,7 +808,7 @@ def help_host_target(help, host, target): - def config_sub(shell, triplet): - config_sub = os.path.join(os.path.dirname(__file__), '..', - 'autoconf', 'config.sub') -- return check_cmd_output(shell, config_sub, triplet).strip() -+ return triplet - - - @depends('--host', shell) --- -2.31.1 - 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 deleted file mode 100644 index a0f37f597..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0003-Do-not-check-binaries-after-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1a47eac590f57c765033c7797b0759dc314f2128 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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/0004-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 deleted file mode 100644 index 665eace66..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0004-Cargo.toml-do-not-abort-on-panic.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:00:24 +0200 -Subject: [PATCH] Cargo.toml: do not abort on panic - -OE's rust is configured to unwind, and this setting clashes with it/ - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Alexander Kanavin -Signed-off-by: Andreas Müller ---- - Cargo.toml | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 897daad41b..505454263e 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -56,13 +56,11 @@ opt-level = 1 - rpath = false - lto = false - debug-assertions = true --panic = "abort" - - [profile.release] - opt-level = 2 - rpath = false - debug-assertions = false --panic = "abort" - - [patch.crates-io] - libudev-sys = { path = "dom/webauthn/libudev-sys" } diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-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 deleted file mode 100644 index d069d00af..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0005-Fixup-compatibility-of-mozbuild-with-Python-3.10.patch +++ /dev/null @@ -1,304 +0,0 @@ -From a88d0c8e27b48344942187c2611bb121bde9332d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= -Date: Tue, 13 Jul 2021 11:46:20 +0200 -Subject: [PATCH] Fixup compatibility of mozbuild with Python 3.10 - -Stolen from [1] - -[1] https://src.fedoraproject.org/rpms/mozjs78/raw/rawhide/f/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch - -Upstream-Status: Pending - ---- - python/mach/mach/config.py | 4 ++-- - python/mach/mach/decorators.py | 2 +- - python/mozbuild/mozbuild/backend/configenvironment.py | 3 ++- - python/mozbuild/mozbuild/makeutil.py | 2 +- - python/mozbuild/mozbuild/util.py | 2 +- - testing/marionette/client/marionette_driver/wait.py | 2 +- - testing/mozbase/manifestparser/manifestparser/filters.py | 3 ++- - testing/mozbase/versioninfo.py | 2 +- - testing/web-platform/tests/tools/manifest/vcs.py | 2 +- - .../web-platform/tests/tools/third_party/h2/h2/settings.py | 2 +- - .../tests/tools/third_party/html5lib/html5lib/_trie/_base.py | 2 +- - .../tools/third_party/html5lib/html5lib/treebuilders/dom.py | 2 +- - .../tests/tools/third_party/hyper/hyper/common/headers.py | 2 +- - .../tests/tools/third_party/hyper/hyper/h2/settings.py | 2 +- - .../tests/tools/third_party/hyper/hyper/http11/connection.py | 4 ++-- - .../third_party/hyper/hyper/packages/hyperframe/flags.py | 2 +- - .../tests/tools/third_party/hyperframe/hyperframe/flags.py | 2 +- - testing/web-platform/tests/tools/wptserve/wptserve/config.py | 3 ++- - testing/web-platform/tests/webdriver/tests/support/sync.py | 2 +- - 19 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/python/mach/mach/config.py b/python/mach/mach/config.py -index 7210eca82..edb4d2e93 100644 ---- a/python/mach/mach/config.py -+++ b/python/mach/mach/config.py -@@ -144,7 +144,7 @@ def reraise_attribute_error(func): - return _ - - --class ConfigSettings(collections.Mapping): -+class ConfigSettings(collections.abc.Mapping): - """Interface for configuration settings. - - This is the main interface to the configuration. -@@ -190,7 +190,7 @@ class ConfigSettings(collections.Mapping): - will result in exceptions being raised. - """ - -- class ConfigSection(collections.MutableMapping, object): -+ class ConfigSection(collections.abc.MutableMapping, object): - """Represents an individual config section.""" - def __init__(self, config, name, settings): - object.__setattr__(self, '_config', config) -diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py -index 27f7f34a6..5f63271a3 100644 ---- a/python/mach/mach/decorators.py -+++ b/python/mach/mach/decorators.py -@@ -140,7 +140,7 @@ def CommandProvider(cls): - 'Conditions argument must take a list ' + \ - 'of functions. Found %s instead.' - -- if not isinstance(command.conditions, collections.Iterable): -+ if not isinstance(command.conditions, collections.abc.Iterable): - msg = msg % (command.name, type(command.conditions)) - raise MachError(msg) - -diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py -index 20d1a9fa6..8747958bd 100644 ---- a/python/mozbuild/mozbuild/backend/configenvironment.py -+++ b/python/mozbuild/mozbuild/backend/configenvironment.py -@@ -9,7 +9,8 @@ import six - import sys - import json - --from collections import Iterable, OrderedDict -+from collections import OrderedDict -+from collections.abc import Iterable - from types import ModuleType - - import mozpack.path as mozpath -diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py -index 4da1a3b26..4ce56848c 100644 ---- a/python/mozbuild/mozbuild/makeutil.py -+++ b/python/mozbuild/mozbuild/makeutil.py -@@ -7,7 +7,7 @@ from __future__ import absolute_import, print_function, unicode_literals - import os - import re - import six --from collections import Iterable -+from collections.abc import Iterable - - - class Makefile(object): -diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py -index 044cf645c..98ed3ef52 100644 ---- a/python/mozbuild/mozbuild/util.py -+++ b/python/mozbuild/mozbuild/util.py -@@ -782,7 +782,7 @@ class HierarchicalStringList(object): - self._strings = StrictOrderingOnAppendList() - self._children = {} - -- class StringListAdaptor(collections.Sequence): -+ class StringListAdaptor(collections.abc.Sequence): - def __init__(self, hsl): - self._hsl = hsl - -diff --git a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py -index eeaa1e23d..c147f463f 100644 ---- a/testing/marionette/client/marionette_driver/wait.py -+++ b/testing/marionette/client/marionette_driver/wait.py -@@ -82,7 +82,7 @@ class Wait(object): - - exceptions = [] - if ignored_exceptions is not None: -- if isinstance(ignored_exceptions, collections.Iterable): -+ if isinstance(ignored_exceptions, collections.abc.Iterable): - exceptions.extend(iter(ignored_exceptions)) - else: - exceptions.append(ignored_exceptions) -diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py -index 287ee033b..b1d608003 100644 ---- a/testing/mozbase/manifestparser/manifestparser/filters.py -+++ b/testing/mozbase/manifestparser/manifestparser/filters.py -@@ -12,7 +12,8 @@ from __future__ import absolute_import - - import itertools - import os --from collections import defaultdict, MutableSequence -+from collections import defaultdict -+from collections.abc import MutableSequence - - import six - from six import string_types -diff --git a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py -index 91d1a0473..8c1680069 100755 ---- a/testing/mozbase/versioninfo.py -+++ b/testing/mozbase/versioninfo.py -@@ -11,7 +11,7 @@ from commit messages. - - from __future__ import absolute_import, print_function - --from collections import Iterable -+from collections.abc import Iterable - from distutils.version import StrictVersion - import argparse - import os -diff --git a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py -index 7c0feeb81..05ee19c7c 100644 ---- a/testing/web-platform/tests/tools/manifest/vcs.py -+++ b/testing/web-platform/tests/tools/manifest/vcs.py -@@ -3,7 +3,7 @@ import json - import os - import stat - from collections import deque --from collections import MutableMapping -+from collections.abc import MutableMapping - - from six import with_metaclass, PY2 - -diff --git a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -index 3da720329..e097630e9 100644 ---- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -+++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -@@ -88,7 +88,7 @@ class ChangedSetting: - ) - - --class Settings(collections.MutableMapping): -+class Settings(collections.abc.MutableMapping): - """ - An object that encapsulates HTTP/2 settings state. - -diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -index a1158bbbf..a9295a2ba 100644 ---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -@@ -1,6 +1,6 @@ - from __future__ import absolute_import, division, unicode_literals - --from collections import Mapping -+from collections.abc import Mapping - - - class Trie(Mapping): -diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -index dcfac220b..818a33433 100644 ---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -@@ -1,7 +1,7 @@ - from __future__ import absolute_import, division, unicode_literals - - --from collections import MutableMapping -+from collections.abc import MutableMapping - from xml.dom import minidom, Node - import weakref - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -index 655a591ac..6454f550a 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -@@ -10,7 +10,7 @@ import collections - from hyper.common.util import to_bytestring, to_bytestring_tuple - - --class HTTPHeaderMap(collections.MutableMapping): -+class HTTPHeaderMap(collections.abc.MutableMapping): - """ - A structure that contains HTTP headers. - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -index fedc5e3c4..040afea92 100755 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -@@ -151,7 +151,7 @@ class ChangedSetting: - ) - - --class Settings(collections.MutableMapping): -+class Settings(collections.abc.MutableMapping): - """ - An object that encapsulates HTTP/2 settings state. - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -index 61361c358..a214311d2 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -@@ -10,7 +10,7 @@ import os - import socket - import base64 - --from collections import Iterable, Mapping -+from collections.abc import Iterable, Mapping - - import collections - from hyperframe.frame import SettingsFrame -@@ -295,7 +295,7 @@ class HTTP11Connection(object): - return - - # Iterables that set a specific content length. -- elif isinstance(body, collections.Iterable): -+ elif isinstance(body, collections.abc.Iterable): - for item in body: - try: - self._sock.send(item) -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -index e8f630056..8f2ea689b 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -@@ -11,7 +11,7 @@ import collections - Flag = collections.namedtuple("Flag", ["name", "bit"]) - - --class Flags(collections.MutableSet): -+class Flags(collections.abc.MutableSet): - """ - A simple MutableSet implementation that will only accept known flags as elements. - -diff --git a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -index 05b35017e..14c352e10 100644 ---- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -+++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -@@ -11,7 +11,7 @@ import collections - Flag = collections.namedtuple("Flag", ["name", "bit"]) - - --class Flags(collections.MutableSet): -+class Flags(collections.abc.MutableSet): - """ - A simple MutableSet implementation that will only accept known flags as - elements. -diff --git a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py -index 7766565fe..3c1c36d6f 100644 ---- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py -+++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py -@@ -2,7 +2,8 @@ import copy - import logging - import os - --from collections import defaultdict, Mapping -+from collections import defaultdict -+from collections.abc import Mapping - from six import integer_types, iteritems, itervalues, string_types - - from . import sslutils -diff --git a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py -index 3fc77131c..8e8f6b819 100644 ---- a/testing/web-platform/tests/webdriver/tests/support/sync.py -+++ b/testing/web-platform/tests/webdriver/tests/support/sync.py -@@ -81,7 +81,7 @@ class Poll(object): - - exceptions = [] - if ignored_exceptions is not None: -- if isinstance(ignored_exceptions, collections.Iterable): -+ if isinstance(ignored_exceptions, collections.abc.Iterable): - exceptions.extend(iter(ignored_exceptions)) - else: - exceptions.append(ignored_exceptions) --- -2.31.1 - - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch deleted file mode 100644 index b56f0b95b..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0006-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/mfbt/RandomNum.cpp -+++ b/mfbt/RandomNum.cpp -@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV - # elif defined(__s390__) - # define GETRANDOM_NR 349 - # elif defined(__mips__) --# include -+# include - # if _MIPS_SIM == _MIPS_SIM_ABI32 - # define GETRANDOM_NR 4353 - # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch deleted file mode 100644 index c0834af58..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0007-fix-musl-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream: No -Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: -https://github.com/void-linux/void-packages/issues/2598 ---- a/js/src/old-configure.in -+++ b/js/src/old-configure.in -@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t - *-android*|*-linuxandroid*) - : - ;; -+ *-musl*) -+ : -+ ;; - *) - AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) - ;; diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch deleted file mode 100644 index 70177d003..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch +++ /dev/null @@ -1,52 +0,0 @@ -Add RISCV32/64 support - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - build/moz.configure/init.configure | 6 ++++++ - python/mozbuild/mozbuild/configure/constants.py | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 0a6a33c..eeee87e 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -755,6 +755,12 @@ def split_triplet(triplet, allow_msvc=False): - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' - endianness = 'little' -+ elif cpu in ("riscv32", "riscv32gc"): -+ canonical_cpu = "riscv32" -+ endianness = "little" -+ elif cpu in ("riscv64", "riscv64gc"): -+ canonical_cpu = "riscv64" -+ endianness = "little" - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index 7542dcd..de25be2 100644 ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -50,6 +50,8 @@ CPU_bitness = { - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, -+ 'riscv32': 32, -+ 'riscv64': 64, - 's390': 32, - 's390x': 64, - 'sh4': 32, -@@ -82,6 +84,8 @@ CPU_preprocessor_checks = OrderedDict(( - ('s390', '__s390__'), - ('ppc64', '__powerpc64__'), - ('ppc', '__powerpc__'), -+ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), -+ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), - ('Alpha', '__alpha__'), - ('hppa', '__hppa__'), - ('sparc64', '__sparc__ && __arch64__'), --- -2.31.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch deleted file mode 100644 index ba50e10c6..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0009-riscv-Disable-atomic-operations.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 64ad80e6d95871f17be4cd01da15581f41ac0b2b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 27 May 2019 21:10:34 -0700 -Subject: [PATCH] riscv: Disable atomic operations - -This was ported from what was used with mozjs-60 which was -Signed-off-by: Khem Raj - -Upstream-Status: Inappropriate[old-version] - -Signed-off-by: Andreas Müller ---- - js/src/jit/AtomicOperations.h | 3 ++- - js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h | 8 ++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h -index 0486cba..cf6b91c 100644 ---- a/js/src/jit/AtomicOperations.h -+++ b/js/src/jit/AtomicOperations.h -@@ -391,7 +391,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) { - #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) || \ - defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ -- defined(__sh__) || defined(__s390__) || defined(__s390x__) -+ defined(__sh__) || defined(__s390__) || defined(__s390x__) || \ -+ defined(__riscv) - # include "jit/shared/AtomicOperations-feeling-lucky.h" - #else - # error "No AtomicOperations support provided for this platform" -diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -index f002cd4..14bb5f9 100644 ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -@@ -77,6 +77,14 @@ - # endif - #endif - -+#ifdef __riscv -+# ifdef __riscv_xlen == 64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+# endif -+#endif -+ -+ - // The default implementation tactic for gcc/clang is to use the newer __atomic - // intrinsics added for use in C++11 . Where that isn't available, we - // use GCC's older __sync functions instead. --- -2.31.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch deleted file mode 100644 index befede172..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0010-riscv-Set-march-correctly.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c3c2d1c69859c5e567005f0c3fa07a0dbe31e4a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 29 Oct 2021 21:18:26 +0200 -Subject: [PATCH] riscv: Set march correctly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from leftover patch in oe-core [1] - -[1] https://github.com/openembedded/openembedded-core/blob/c884878f6c833b18a3a95b193f5de68df5bcea48/meta/recipes-devtools/rust/files/rv64gc.patch - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - third_party/rust/cc/src/lib.rs | 14 ++++++++++---- - third_party/rust/cc/.cargo-checksum.json | 2 +- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/third_party/rust/cc/src/lib.rs b/third_party/rust/cc/src/lib.rs -index 621d31d..6f72e13 100644 ---- a/third_party/rust/cc/src/lib.rs -+++ b/third_party/rust/cc/src/lib.rs -@@ -1587,14 +1587,20 @@ impl Build { - let mut parts = target.split('-'); - if let Some(arch) = parts.next() { - let arch = &arch[5..]; -- cmd.args.push(("-march=rv".to_owned() + arch).into()); -- // ABI is always soft-float right now, update this when this is no longer the -- // case: -- if arch.starts_with("64") { -+ if target.contains("linux") && arch.starts_with("64") { -+ cmd.args.push(("-march=rv64gc").into()); -+ cmd.args.push("-mabi=lp64d".into()); -+ } else if target.contains("linux") && arch.starts_with("32") { -+ cmd.args.push(("-march=rv32gc").into()); -+ cmd.args.push("-mabi=ilp32d".into()); -+ } else if arch.starts_with("64") { -+ cmd.args.push(("-march=rv".to_owned() + arch).into()); - cmd.args.push("-mabi=lp64".into()); - } else { -+ cmd.args.push(("-march=rv".to_owned() + arch).into()); - cmd.args.push("-mabi=ilp32".into()); - } -+ cmd.args.push("-mcmodel=medany".into()); - } - } - } -diff --git a/third_party/rust/cc/.cargo-checksum.json b/third_party/rust/cc/.cargo-checksum.json -index 417fde7..70e5d02 100644 ---- a/third_party/rust/cc/.cargo-checksum.json -+++ b/third_party/rust/cc/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"4753929dbb7b676c19d7cfa06d0a47e37003554b80c536cbf2b892d591ef61c2","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"} -\ No newline at end of file -+{"files":{"Cargo.lock":"3aff5f8b0a7f4d72852b11b0526f0002e6bf55f19f1ebd6470d7f97fbd540e60","Cargo.toml":"6ab10d9b6a9c6f0909074e6698c90c6b6a7223661ec2e83174d2593117cbe7f2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7184fbdf375a057e673257348f6d7584c0dd11b66318d98f3647f69eb610b097","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"feab2b4cc51fcfb041f83a1a689960c3c9abfbaa9580ba186244a880586ba29a","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"388e79dcf3e84078ae0b086c6cdee9cf9eb7e3ffafdcbf3e2df26163661f5856","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"71620b178583b6e6e5e0d4cac14e2cef6afc62fb6841e0c72ed1784543abf8ac","tests/test.rs":"1605640c9b94a77f48fc92e1dc0485bdf1960da5626e2e00279e4703691656bc"},"package":"aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"} --- -2.31.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-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 deleted file mode 100644 index adca9c721..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0011-replace-include-by-code-to-fix-arm-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Sat, 1 Jun 2019 09:06:01 +0900 -Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and - user_vfp_exc. - -* We need this to fix arm builds -* Stolen from [1] - -[1] https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d - -Signed-off-by: Andreas Müller - -Upstream-Status: Pending ---- - js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 636537f8478..383c380f04c 100644 ---- a/js/src/wasm/WasmSignalHandlers.cpp -+++ b/js/src/wasm/WasmSignalHandlers.cpp -@@ -248,7 +248,16 @@ using mozilla::DebugOnly; - #endif - - #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS --# include -+struct user_vfp { -+ unsigned long long fpregs[32]; -+ unsigned long fpscr; -+}; -+ -+struct user_vfp_exc { -+ unsigned long fpexc; -+ unsigned long fpinst; -+ unsigned long fpinst2; -+}; - #endif - - #if defined(ANDROID) --- -GitLab - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-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 deleted file mode 100644 index ca37ca72c..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0012-Add-SharedArrayRawBufferRefs-to-public-API.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ccdd47cee610cb33fa5f67f856a68f5e411c79d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 31 Oct 2021 18:32:39 +0100 -Subject: [PATCH] Add SharedArrayRawBufferRefs to public API -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] https://src.fedoraproject.org/rpms/mozjs78/blob/rawhide/f/FixSharedArray.diff - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - js/public/StructuredClone.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/public/StructuredClone.h b/js/public/StructuredClone.h -index cb3cd5b..06da4dd 100644 ---- a/js/public/StructuredClone.h -+++ b/js/public/StructuredClone.h -@@ -381,7 +381,7 @@ enum OwnTransferablePolicy { - namespace js { - class SharedArrayRawBuffer; - --class SharedArrayRawBufferRefs { -+class JS_PUBLIC_API SharedArrayRawBufferRefs { - public: - SharedArrayRawBufferRefs() = default; - SharedArrayRawBufferRefs(SharedArrayRawBufferRefs&& other) = default; --- -2.31.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch deleted file mode 100644 index e943cf1ba..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0013-util.configure-fix-one-occasionally-reproduced-confi.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 430fd956b91c6208f166753578234c2f5db6352f Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 11 Nov 2021 21:17:38 +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 7ee1a498ad..511e257ad9 100644 ---- a/build/moz.configure/util.configure -+++ b/build/moz.configure/util.configure -@@ -217,7 +217,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/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch deleted file mode 100644 index 7b938179c..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0014-rewrite-cargo-host-linker-in-python3.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 18 Nov 2021 07:16:39 +0000 -Subject: [PATCH] Rewrite cargo-host-linker in python3 - -Mozjs compile failed with this failure: -/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) - -Root Cause: -cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd -with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links -libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But -host libc is older libc. So the incompatible problem occurred. - -Solution: -rewrite cargo-host-linker in python3 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Changqing Li ---- - build/cargo-host-linker | 24 +++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/build/cargo-host-linker b/build/cargo-host-linker -index cbd0472bf7..ccd8bffec1 100755 ---- a/build/cargo-host-linker -+++ b/build/cargo-host-linker -@@ -1,3 +1,21 @@ --#!/bin/sh --# See comment in cargo-linker. --eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' -+#!/usr/bin/env python3 -+ -+import os,sys -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): -+ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] -+else: -+ sys.exit(0) -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+else: -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] -+ -+os.execvp(binary, args) --- -2.33.1 - 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 deleted file mode 100644 index 7d4e4a81f..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb +++ /dev/null @@ -1,146 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" - -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-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 \ - file://0013-util.configure-fix-one-occasionally-reproduced-confi.patch \ - file://0014-rewrite-cargo-host-linker-in-python3.patch \ -" - -SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151" -S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" - -DEPENDS = " \ - autoconf-2.13-native \ - icu-native \ - icu \ - cargo-native \ - zlib \ - python3-six \ - python3-six-native \ -" - -inherit autotools pkgconfig rust python3native siteinfo - -JIT ?= "" -JIT:mipsarch = "--disable-jit" - -EXTRA_OECONF = " \ - --target=${RUST_TARGET_SYS} \ - --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --without-system-icu \ - --disable-tests --disable-strip --disable-optimize \ - --disable-jemalloc \ - --with-system-icu \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ - ${JIT} \ -" -# Note: Python with mozilla build is a mess: E.g: python-six: to get an error -# free configure we need: -# * python3-six-native in DEPENDS -# * python3-six in DEPENDS -# * path to python-six shipped by mozilla in PYTHONPATH -prepare_python_and_rust() { - if [ ! -f ${B}/PYTHONPATH ]; then - oldpath=`pwd` - cd ${S} - # Add mozjs python-modules necessary - PYTHONPATH="${S}/build:${S}/config" - PYTHONPATH="$PYTHONPATH:${S}/third_party/python/distro:${S}/third_party/python/jsmin" - PYTHONPATH="$PYTHONPATH:${S}/third_party/python/pytoml:${S}/third_party/python/six" - PYTHONPATH="$PYTHONPATH:${S}/third_party/python/pyyaml/lib3:${S}/third_party/python/which" - for sub_dir in python testing/mozbase; do - for module_dir in `ls $sub_dir -1`;do - [ $module_dir = "virtualenv" ] && continue - if [ -d "${S}/$sub_dir/$module_dir" ];then - PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" - fi - done - done - # looks odd but it's huge and we want to see what's in there - echo "$PYTHONPATH" > ${B}/PYTHONPATH - cd "$oldpath" - fi - - export PYTHONPATH=`cat ${B}/PYTHONPATH` - - export RUST_TARGET_PATH="${RUST_TARGET_PATH}" - export RUST_TARGET="${TARGET_SYS}" - export RUSTFLAGS="${RUSTFLAGS}" -} - -export HOST_CC = "${BUILD_CC}" -export HOST_CXX = "${BUILD_CXX}" -export HOST_CFLAGS = "${BUILD_CFLAGS}" -export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" -export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" -# otherwise we are asked for yasm... -export AS = "${CC}" - -CPPFLAGS:append:mips:toolchain-clang = " -fpie" -CPPFLAGS:append:mipsel:toolchain-clang = " -fpie" - -do_configure() { - prepare_python_and_rust - - cd ${S}/js/src - autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure - - cd ${B} - # * use of /tmp can causes problems on heavily loaded hosts - # * with mozjs-78 we get without: - # | Path specified in LOCAL_INCLUDES (..) resolves to the topsrcdir or topobjdir (/oe-core-glibc/work/cortexa72-mortsgna-linux/mozjs-78/78.15.0-r0/firefox-78.15.0/js/src), which is not allowed - mkdir -p "${B}/lcl_tmp" - TMPDIR="${B}/lcl_tmp" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${S}/js/src/configure ${EXTRA_OECONF} - - # inspired by what fedora [1] does: for big endian rebuild icu dat - # this avoids gjs qemu crash on mips at gir creation - # [1] https://src.fedoraproject.org/rpms/mozjs78/blob/rawhide/f/mozjs78.spec - if [ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} = "big" -a ! -e ${S}/config/external/icu/data/icudt67b.dat ]; then - echo "Do big endian icu dat-convert..." - icupkg -tb ${S}/config/external/icu/data/icudt67l.dat ${S}/config/external/icu/data/icudt67b.dat - rm -f ${S}/config/external/icu/data/icudt*l.dat - fi -} - -do_compile:prepend() { - prepare_python_and_rust -} - -do_install:prepend() { - prepare_python_and_rust -} - -do_install:append() { - # tidy up installation - chmod -x ${D}${libdir}/pkgconfig/*.pc - sed -i 's:\x24{includedir}/mozjs-78/js/RequiredDefines.h:js/RequiredDefines.h:g' ${D}${libdir}/pkgconfig/*.pc - - rm -f ${D}${libdir}/libjs_static.ajs -} - -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:armv4 = "arm" - -DISABLE_STATIC = "" - -PACKAGES =+ "lib${BPN}" -FILES:lib${BPN} += "${libdir}/lib*" From patchwork Wed Sep 14 12:03:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 12850 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB83CECAAD8 for ; Wed, 14 Sep 2022 12:03:43 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.5322.1663157014333825884 for ; Wed, 14 Sep 2022 05:03:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=c2h0vIvy; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id n8so3887149wmr.5 for ; Wed, 14 Sep 2022 05:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uO9UAEe0OQQbf+tZsB+sYM1gxtwjdsru8/eOtUV11V8=; b=c2h0vIvymipqSr0+B6NJvPYIbwJTKWmz+PAZYdI+gy+lWmm8XfOR8yrjPj1EpuGHxZ edmWmxhqsOV1uyNKtZx+rOkOAI4+vEQWN8+E5LDdKK4UUNc6GVeOw5i+8PQmtn1GbpWO /8GpErdb5+leWvgvOTkxCayUkH/kkN9RwlzQ+aY3tTQSvRZvnKgpilaqnQsN/Khpw/F6 S6b/ec44nnQ96j7mieB7zohjNv1Qwa3Stkdse40PFHzrywIuW3M00bai1wWmtWaenyZl esy3JykKyjFiMABe/q0MHnEcK87OeaK22kvhWDWo8O5iGpvZ8IP3ez+C5r6YLmdRe7zX 3bHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uO9UAEe0OQQbf+tZsB+sYM1gxtwjdsru8/eOtUV11V8=; b=nR/DtLm9G4vYsnffHjUmXfi+UN0pDXQ3QFHgufPILTgMfSrKi/AC/ZxQwiK/0+GK4g b2kRZco6tBz5xCJ16QafFb/RB8Ch0IBIfGM/O15HsbKMASZurxjBrlRaUf5yBrhUhnLY nmnksAFg2OtXyevnAq1fTTsOZ/zsbXPNzV3SaPYQ5b64neb19eaMiLeClm8J+cN7CkT6 vA7Uvdg8ikkMxkXqzeR+LgfbMEV9fMXEDiOd/ajEgEPuDhS0bhQIUIgiXdixvr/N+/4L LOwnLgfl6AToR++G20T3bZUynzM4lVSM/Yl9Ix9qqPHmXel/Hew5PC3wPbLfh8v5ZWFy ryGA== X-Gm-Message-State: ACgBeo2r39Ng5HP4X0raJteW/ysXLShUB0TelGRbY4ulo3Np2sCykI+V qUtZ/4vnO0aZEmYVojvVIv3b5QNaN5sRKQ== X-Google-Smtp-Source: AA6agR6Flq6ddHmU4EP/DEI7SulQ+wlH7qg1bOrCkr2hACvVZbd7ddv6qb3otl2hTQylJNmEp6khHA== X-Received: by 2002:a05:600c:3512:b0:3b4:9240:7a5 with SMTP id h18-20020a05600c351200b003b4924007a5mr2919485wmq.42.1663157012841; Wed, 14 Sep 2022 05:03:32 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w1-20020a5d6081000000b0022a2dbc80fdsm13286233wrt.10.2022.09.14.05.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 05:03:32 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 8/8] sip3: remove the recipe Date: Wed, 14 Sep 2022 14:03:16 +0200 Message-Id: <20220914120316.551377-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220914120316.551377-1-alex@linutronix.de> References: <20220914120316.551377-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 14 Sep 2022 12:03:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98802 It is not compatible with python 3.11, and all development has ceased: https://riverbankcomputing.com/software/sip/download Signed-off-by: Alexander Kanavin --- .../packagegroups/packagegroup-meta-oe.bb | 1 - meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.23.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 756ba46e3..cc1c87712 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -301,7 +301,6 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ python3-distutils-extra \ python3-pycups \ rapidjson \ - sip3 \ squashfs-tools-ng \ uftrace \ unifex \ diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb deleted file mode 100644 index d6335585e..000000000 --- a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "https://riverbankcomputing.com/software/sip/" -SECTION = "devel" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" - -SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "70adc0c9734e2d9dcd241d3f931dfc74" -SRC_URI[sha256sum] = "22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7" - -inherit python3-dir python3native - -S = "${WORKDIR}/sip-${PV}" - -DEPENDS = "python3" - -PACKAGES += "python3-sip3" - -BBCLASSEXTEND = "native" - -CONFIGURE_SYSROOT = "${STAGING_DIR_HOST}" -CONFIGURE_SYSROOT:class-native = "${STAGING_DIR_NATIVE}" - -do_configure:prepend() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${STAGING_INCDIR}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" -} - -do_install() { - oe_runmake install -} - -FILES:python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES:${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"