* [PATCH 02/26] serf: mark upstream as defunct
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 03/26] python3: drop unneeded multiprocessing module patch Alexander Kanavin
` (23 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 2 +-
...op.creating.directories.without.sandbox-install.prefix.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
index e6172ef5aa..91ccc8a474 100644
--- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
+++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
Upstream removed it in
https://github.com/openssl/openssl/pull/16004
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
buckets/ssl_buckets.c | 3 +--
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
index 91640d6044..4105868a7e 100644
--- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
+++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
@@ -31,7 +31,7 @@ ERROR: scons install execution failed.
and the installed paths (including the paths inside libserf*.pc)
look correct
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 03/26] python3: drop unneeded multiprocessing module patch
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
2021-12-15 22:40 ` [PATCH 02/26] serf: mark upstream as defunct Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 04/26] elfutils: update patch submitted upstream Alexander Kanavin
` (22 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Hongxu Jia, Alexander Kanavin
I ran the reproducing sequence on qemux86, and it went fine:
root@qemux86:~# python3
Python 3.10.0 (default, Oct 4 2021, 17:55:55) [GCC 11.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import multiprocessing
>>> pool_sema = multiprocessing.BoundedSemaphore(value=1)
>>> pool_sema.acquire()
True
>>> pool_sema.release()
>>>
Additionally AB testing revealed no issues, and the description isn't entirely
clear about where and how the problem occurs, so I can't submit it upsream
without having that understanding and how to demonstrate the problem.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...ssing-libraries-to-Extension-for-mul.patch | 70 -------------------
.../recipes-devtools/python/python3_3.10.1.bb | 1 -
2 files changed, 71 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
diff --git a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch b/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
deleted file mode 100644
index 374433c68e..0000000000
--- a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From bad7e6a625436402a01d03021fb9ccd58bc9930f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Jan 2020 17:44:05 +0100
-Subject: [PATCH] setup.py: pass missing libraries to Extension for
- multiprocessing module
-
-In the following commit:
-...
-commit e711cafab13efc9c1fe6c5cd75826401445eb585
-Author: Benjamin Peterson <benjamin@python.org>
-Date: Wed Jun 11 16:44:04 2008 +0000
-
- Merged revisions 64104,64117 via svnmerge from
- svn+ssh://pythondev@svn.python.org/python/trunk
-...
-(see diff in setup.py)
-It assigned libraries for multiprocessing module according
-the host_platform, but not pass it to Extension.
-
-In glibc, the following commit caused two definition of
-sem_getvalue are different.
-https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524
-(see diff in nptl/sem_getvalue.c for detail)
-`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1
-and `__old_sem_getvalue' is to compat the old version
-sem_getvalue@GLIBC_2.0.
-
-To build python for embedded Linux systems:
-http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html
-If not explicitly link to library pthread (-lpthread), it will
-load glibc's sem_getvalue randomly at runtime.
-
-Such as build python on linux x86_64 host and run the python
-on linux x86_32 target. If not link library pthread, it caused
-multiprocessing bounded semaphore could not work correctly.
-...
->>> import multiprocessing
->>> pool_sema = multiprocessing.BoundedSemaphore(value=1)
->>> pool_sema.acquire()
-True
->>> pool_sema.release()
-Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
-ValueError: semaphore or lock released too many times
-...
-
-And the semaphore issue also caused multiprocessing.Queue().put() hung.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index d92face..f42bcbb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1836,7 +1836,7 @@ class PyBuildExt(build_ext):
- if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
- sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
- multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-- self.add(Extension('_multiprocessing', multiprocessing_srcs,
-+ self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'],
- include_dirs=["Modules/_multiprocessing"]))
-
- if (not MS_WINDOWS and
diff --git a/meta/recipes-devtools/python/python3_3.10.1.bb b/meta/recipes-devtools/python/python3_3.10.1.bb
index 6115ffe5b3..a51fc8f415 100644
--- a/meta/recipes-devtools/python/python3_3.10.1.bb
+++ b/meta/recipes-devtools/python/python3_3.10.1.bb
@@ -25,7 +25,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
file://0001-test_locale.py-correct-the-test-output-format.patch \
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
- file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 04/26] elfutils: update patch submitted upstream
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
2021-12-15 22:40 ` [PATCH 02/26] serf: mark upstream as defunct Alexander Kanavin
2021-12-15 22:40 ` [PATCH 03/26] python3: drop unneeded multiprocessing module patch Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 05/26] rust-hello-world: test at runtime Alexander Kanavin
` (21 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Alexander Kanavin, Khem Raj
As that's what upstream prefers.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../elfutils/elfutils_0.186.bb | 2 +-
...infod-client.c-correct-string-format.patch | 64 -------------------
...infod-client.c-use-long-for-cache-ti.patch | 45 +++++++++++++
.../elfutils/files/0003-musl-utils.patch | 2 +-
.../0015-config-eu.am-do-not-use-Werror.patch | 2 +-
5 files changed, 48 insertions(+), 67 deletions(-)
delete mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
create mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.186.bb b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
index b3588a2196..93f53c1f2e 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.186.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
@@ -21,8 +21,8 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://run-ptest \
file://ptest.patch \
file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
- file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
+ file://0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch \
"
SRC_URI:append:libc-musl = " \
file://0003-musl-utils.patch \
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
deleted file mode 100644
index 85f22cb395..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 38ddd0d1863f83e8ec545d0160bdf00bbb5569ba Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 19 Apr 2021 23:29:10 +0200
-Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on
- 32bit arches with 64bit time_t
-
-Use intmax_t to print time_t
-
-time_t is platform dependent and some of architectures e.g.
-x32, riscv32, arc use 64bit time_t even while they are 32bit
-architectures, therefore directly using integer printf formats will not
-work portably, use intmax_t to typecast time_t into printf family of
-functions
-
-Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- debuginfod/debuginfod-client.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
-index c875ee6..df9737d 100644
---- a/debuginfod/debuginfod-client.c
-+++ b/debuginfod/debuginfod-client.c
-@@ -231,15 +231,15 @@ debuginfod_config_cache(char *config_path,
- if (fd < 0)
- return -errno;
-
-- if (dprintf(fd, "%ld", cache_config_default_s) < 0)
-+ if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0)
- return -errno;
- }
-
-- long cache_config;
-+ int cache_config;
- FILE *config_file = fopen(config_path, "r");
- if (config_file)
- {
-- if (fscanf(config_file, "%ld", &cache_config) != 1)
-+ if (fscanf(config_file, "%d", &cache_config) != 1)
- cache_config = cache_config_default_s;
- fclose(config_file);
- }
-@@ -272,7 +272,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
- if (fd < 0)
- return -errno;
-
-- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0)
-+ if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0)
- return -errno;
-
- /* init max age config file. */
-@@ -280,7 +280,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
- && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
- return -errno;
-
-- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0)
-+ if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0)
- return -errno;
-
- return 0;
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch
new file mode 100644
index 0000000000..089f1a2210
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch
@@ -0,0 +1,45 @@
+From a0852044907110479d0fb212dda2c5e45af2d3aa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 9 Dec 2021 10:43:06 +0100
+Subject: [PATCH] debuginfod/debuginfod-client.c: use long for cache time
+ configurations
+
+time_t is platform dependent and some of architectures e.g.
+x32, riscv32, arc use 64bit time_t even while they are 32bit
+architectures, therefore directly using integer printf formats will not
+work portably.
+
+Use a plain long everywhere as the intervals are small enough
+that it will not be problematic.
+
+Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ debuginfod/debuginfod-client.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
+index c875ee6..11e0fd5 100644
+--- a/debuginfod/debuginfod-client.c
++++ b/debuginfod/debuginfod-client.c
+@@ -134,17 +134,17 @@ struct debuginfod_client
+ how frequently the cache should be cleaned. The file's st_mtime represents
+ the time of last cleaning. */
+ static const char *cache_clean_interval_filename = "cache_clean_interval_s";
+-static const time_t cache_clean_default_interval_s = 86400; /* 1 day */
++static const long cache_clean_default_interval_s = 86400; /* 1 day */
+
+ /* The cache_miss_default_s within the debuginfod cache specifies how
+ frequently the 000-permision file should be released.*/
+-static const time_t cache_miss_default_s = 600; /* 10 min */
++static const long cache_miss_default_s = 600; /* 10 min */
+ static const char *cache_miss_filename = "cache_miss_s";
+
+ /* The cache_max_unused_age_s file within the debuginfod cache specifies the
+ the maximum time since last access that a file will remain in the cache. */
+ static const char *cache_max_unused_age_filename = "max_unused_age_s";
+-static const time_t cache_default_max_unused_age_s = 604800; /* 1 week */
++static const long cache_default_max_unused_age_s = 604800; /* 1 week */
+
+ /* Location of the cache of files downloaded from debuginfods.
+ The default parent directory is $HOME, or '/' if $HOME doesn't exist. */
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index 85f8140330..cbc9fce790 100644
--- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
@@ -1,4 +1,4 @@
-From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
+From 8b48c580bae0b0ffc773b0b829c50d33a907853c Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 23 Aug 2019 10:19:48 +0800
Subject: [PATCH] musl-utils
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
index c96cfd9777..9952070939 100644
--- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
+++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
@@ -1,4 +1,4 @@
-From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
+From 5e39da062929a60a07ddfc8b6d435ea65ea3e31f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 22 Jun 2020 21:35:16 +0000
Subject: [PATCH] config/eu.am: do not use -Werror
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 05/26] rust-hello-world: test at runtime
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (2 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 04/26] elfutils: update patch submitted upstream Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 06/26] vim: do not report upstream version check as broken Alexander Kanavin
` (20 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This adds a smoke check for whether the rust toolchain actually
produces working executables across a range of architectures.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/classes/testimage.bbclass | 2 +-
meta/lib/oeqa/runtime/cases/rust.py | 19 +++++++++++++++++++
.../packagegroup-core-tools-testapps.bb | 3 +++
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 meta/lib/oeqa/runtime/cases/rust.py
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 66de0e07c6..1c5fd4ee6a 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -61,7 +61,7 @@ BASICTESTSUITE = "\
ping date df ssh scp python perl gi ptest parselogs \
logrotate connman systemd oe_syslog pam stap ldd xorg \
kernelmodule gcc buildcpio buildlzip buildgalculator \
- dnf rpm opkg apt weston go"
+ dnf rpm opkg apt weston go rust"
DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
diff --git a/meta/lib/oeqa/runtime/cases/rust.py b/meta/lib/oeqa/runtime/cases/rust.py
new file mode 100644
index 0000000000..b3d6cf7f37
--- /dev/null
+++ b/meta/lib/oeqa/runtime/cases/rust.py
@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.runtime.decorator.package import OEHasPackage
+
+class RustHelloworldTest(OERuntimeTestCase):
+ @OETestDepends(['ssh.SSHTest.test_ssh'])
+ @OEHasPackage(['rust-hello-world'])
+ def test_rusthelloworld(self):
+ cmd = "rust-hello-world"
+ status, output = self.target.run(cmd)
+ msg = 'Exit status was not 0. Output: %s' % output
+ self.assertEqual(status, 0, msg=msg)
+
+ msg = 'Incorrect output: %s' % output
+ self.assertEqual(output, "Hello, world!", msg=msg)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 1fee1c925d..e05e329020 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -25,6 +25,8 @@ GOTOOLS ?= "go-helloworld"
GOTOOLS:powerpc ?= ""
GOTOOLS:riscv32 ?= ""
+RUSTTOOLS ?= "rust-hello-world"
+
GSTEXAMPLES ?= "gst-examples"
GSTEXAMPLES:riscv64 = ""
@@ -57,4 +59,5 @@ RDEPENDS:${PN} = "\
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \
${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
${GOTOOLS} \
+ ${RUSTTOOLS} \
"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 06/26] vim: do not report upstream version check as broken
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (3 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 05/26] rust-hello-world: test at runtime Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 07/26] btrfs-tools: upgrade 5.15 -> 5.15.1 Alexander Kanavin
` (19 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
As upstream tags point releases with every commit and
the version check still reports 8.2, it should not be considered
broken (e.g. current version newer than latest version)
until 8.3 is released.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-support/vim/vim.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index dc11a0aabb..34963054fd 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -23,6 +23,9 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
PV .= ".3752"
SRCREV = "8603be338ac810446f23c092f21bc6082f787519"
+# Remove when 8.3 is out
+UPSTREAM_VERSION_UNKNOWN = "1"
+
# Do not consider .z in x.y.z, as that is updated with every commit
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 07/26] btrfs-tools: upgrade 5.15 -> 5.15.1
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (4 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 06/26] vim: do not report upstream version check as broken Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 08/26] python3-hypothesis: upgrade 6.30.0 -> 6.31.4 Alexander Kanavin
` (18 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../btrfs-tools/{btrfs-tools_5.15.bb => btrfs-tools_5.15.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.bb => btrfs-tools_5.15.1.bb} (98%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
index 399ba17e3e..9f3c0e9abb 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
"
-SRCREV = "4d06e4a13d1ce1849a60b68969bc385ab736ddf7"
+SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= " \
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 08/26] python3-hypothesis: upgrade 6.30.0 -> 6.31.4
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (5 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 07/26] btrfs-tools: upgrade 5.15 -> 5.15.1 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 09/26] python3-setuptools: upgrade 59.4.0 -> 59.5.0 Alexander Kanavin
` (17 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...ython3-hypothesis_6.30.0.bb => python3-hypothesis_6.31.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-hypothesis_6.30.0.bb => python3-hypothesis_6.31.4.bb} (91%)
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.30.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.31.4.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.30.0.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.31.4.bb
index 59c56e2d94..6af290d8ca 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.30.0.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.31.4.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
file://test_rle.py \
"
-SRC_URI[sha256sum] = "6d81d409b4a1a3ff9458de5f2cf7ee37b1dd51473aacc79f257c62e2369a5fd7"
+SRC_URI[sha256sum] = "7fa3911d7be699a3139dfa1d9625deed649f651beaab3422c0339742e66d32d0"
RDEPENDS:${PN} += " \
python3-attrs \
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 09/26] python3-setuptools: upgrade 59.4.0 -> 59.5.0
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (6 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 08/26] python3-hypothesis: upgrade 6.30.0 -> 6.31.4 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 10/26] less: upgrade 590 -> 598 Alexander Kanavin
` (16 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-conditionally-do-not-fetch-code-by-easy_install.patch | 2 +-
...ython3-setuptools_59.4.0.bb => python3-setuptools_59.5.0.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_59.4.0.bb => python3-setuptools_59.5.0.bb} (94%)
diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index c3ced74918..5e2ee454da 100644
--- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@
-From 61ebf2a12a308a2d99023f51c9da8b1991bdc164 Mon Sep 17 00:00:00 2001
+From da88c57fe03e4474ba20325edacf519e80c1d7a8 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 17 Jul 2018 10:13:38 +0800
Subject: [PATCH] conditionally do not fetch code by easy_install
diff --git a/meta/recipes-devtools/python/python3-setuptools_59.4.0.bb b/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb
similarity index 94%
rename from meta/recipes-devtools/python/python3-setuptools_59.4.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_59.5.0.bb
index 5ae076a165..878fa08404 100644
--- a/meta/recipes-devtools/python/python3-setuptools_59.4.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb
@@ -13,7 +13,7 @@ SRC_URI += "\
file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \
"
-SRC_URI[sha256sum] = "b4c634615a0cf5b02cf83c7bedffc8da0ca439f00e79452699454da6fbd4153d"
+SRC_URI[sha256sum] = "d144f85102f999444d06f9c0e8c737fd0194f10f2f7e5fdb77573f6e2fa4fad0"
DEPENDS += "${PYTHON_PN}"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 10/26] less: upgrade 590 -> 598
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (7 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 09/26] python3-setuptools: upgrade 59.4.0 -> 59.5.0 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 11/26] lighttpd: upgrade 1.4.61 -> 1.4.63 Alexander Kanavin
` (15 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
License-Update: http->https
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-extended/less/{less_590.bb => less_598.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/less/{less_590.bb => less_598.bb} (87%)
diff --git a/meta/recipes-extended/less/less_590.bb b/meta/recipes-extended/less/less_598.bb
similarity index 87%
rename from meta/recipes-extended/less/less_590.bb
rename to meta/recipes-extended/less/less_598.bb
index 5d0d0a5afe..574efff365 100644
--- a/meta/recipes-extended/less/less_590.bb
+++ b/meta/recipes-extended/less/less_598.bb
@@ -20,7 +20,7 @@ SECTION = "console/utils"
#
LICENSE = "GPLv3+ | BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
file://LICENSE;md5=ba01d0cab7f62f7f2204c7780ff6a87d \
"
DEPENDS = "ncurses"
@@ -28,7 +28,7 @@ DEPENDS = "ncurses"
SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
"
-SRC_URI[sha256sum] = "6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10"
+SRC_URI[sha256sum] = "64e0eb24534ac70d15ff3a36c8853f7a48196aa230d2a104707fc4ff1a45e982"
UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 11/26] lighttpd: upgrade 1.4.61 -> 1.4.63
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (8 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 10/26] less: upgrade 590 -> 598 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 12/26] harfbuzz: upgrade 3.1.2 -> 3.2.0 Alexander Kanavin
` (14 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../lighttpd/{lighttpd_1.4.61.bb => lighttpd_1.4.63.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.61.bb => lighttpd_1.4.63.bb} (97%)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.63.bb
similarity index 97%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.63.bb
index 583b0e260c..41d6319e1b 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.63.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://lighttpd \
"
-SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432"
+SRC_URI[sha256sum] = "2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9"
DEPENDS = "virtual/crypt"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 12/26] harfbuzz: upgrade 3.1.2 -> 3.2.0
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (9 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 11/26] lighttpd: upgrade 1.4.61 -> 1.4.63 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 13/26] piglit: upgrade to latest revision Alexander Kanavin
` (13 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../harfbuzz/{harfbuzz_3.1.2.bb => harfbuzz_3.2.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_3.1.2.bb => harfbuzz_3.2.0.bb} (95%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_3.1.2.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb
similarity index 95%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_3.1.2.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb
index 368f7c1bde..647bafc4d3 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_3.1.2.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb
@@ -12,7 +12,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "4056b1541dd8bbd8ec29207fe30e568805c0705515632d7fec53a94399bc7945"
+SRC_URI[sha256sum] = "0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd"
inherit meson pkgconfig lib_package gtk-doc gobject-introspection
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 13/26] piglit: upgrade to latest revision
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (10 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 12/26] harfbuzz: upgrade 3.1.2 -> 3.2.0 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 14/26] alsa: upgrade 1.2.5 -> 1.2.6 Alexander Kanavin
` (12 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index c5f3ecea16..70c7529f91 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
"
UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "efa64335e22f1af0277f4d4dd7629e8674875490"
+SRCREV = "f855ad1c8ab0a7b25437b1a48b9038f599f31691"
# (when PV goes above 1.0 remove the trailing r)
PV = "1.0+gitr${SRCPV}"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 14/26] alsa: upgrade 1.2.5 -> 1.2.6
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (11 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 13/26] piglit: upgrade to latest revision Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1 Alexander Kanavin
` (11 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../alsa/{alsa-lib_1.2.5.1.bb => alsa-lib_1.2.6.1.bb} | 2 +-
.../alsa/{alsa-plugins_1.2.5.bb => alsa-plugins_1.2.6.bb} | 2 +-
.../alsa/{alsa-ucm-conf_1.2.5.1.bb => alsa-ucm-conf_1.2.6.2.bb} | 2 +-
...lsa-utils-scripts_1.2.5.1.bb => alsa-utils-scripts_1.2.6.bb} | 0
meta/recipes-multimedia/alsa/alsa-utils.inc | 2 +-
.../alsa/{alsa-utils_1.2.5.1.bb => alsa-utils_1.2.6.bb} | 0
6 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.5.1.bb => alsa-lib_1.2.6.1.bb} (94%)
rename meta/recipes-multimedia/alsa/{alsa-plugins_1.2.5.bb => alsa-plugins_1.2.6.bb} (98%)
rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.5.1.bb => alsa-ucm-conf_1.2.6.2.bb} (89%)
rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.5.1.bb => alsa-utils-scripts_1.2.6.bb} (100%)
rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.5.1.bb => alsa-utils_1.2.6.bb} (100%)
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.6.1.bb
similarity index 94%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.6.1.bb
index cf7c3fcd43..7c03287b84 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.6.1.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
"
SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e"
+SRC_URI[sha256sum] = "ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f"
inherit autotools pkgconfig
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb
similarity index 98%
rename from meta/recipes-multimedia/alsa/alsa-plugins_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb
index 0eac982e1a..7b1ca2ee15 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.5.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
"
SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20"
+SRC_URI[sha256sum] = "068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0"
DEPENDS += "alsa-lib"
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.1.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.6.2.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.1.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.6.2.bb
index 9d874eca13..10860e61a0 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.6.2.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97"
+SRC_URI[sha256sum] = "8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822"
# Something went wrong at upstream tarballing
inherit allarch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.bb
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb
rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils.inc b/meta/recipes-multimedia/alsa/alsa-utils.inc
index 95b93d4432..631cbe1029 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils.inc
+++ b/meta/recipes-multimedia/alsa/alsa-utils.inc
@@ -24,7 +24,7 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook
# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0"
+SRC_URI[sha256sum] = "6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d"
# On build machines with python-docutils (not python3-docutils !!) installed
# rst2man (not rst2man.py) is detected and compile fails with
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (12 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 14/26] alsa: upgrade 1.2.5 -> 1.2.6 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-16 10:50 ` Alexey Brodkin
2021-12-15 22:40 ` [PATCH 16/26] go: upgrade 1.17.4 -> 1.17.5 Alexander Kanavin
` (10 subsequent siblings)
24 siblings, 1 reply; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Alexey Brodkin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-devtools/dpkg/dpkg.inc | 2 +
...ild.c-ignore-return-of-1-from-tar-cf.patch | 8 +--
.../0014-arch-Add-support-for-ARCv2-CPU.patch | 68 -------------------
.../dpkg/{dpkg_1.20.9.bb => dpkg_1.21.1.bb} | 5 +-
4 files changed, 8 insertions(+), 75 deletions(-)
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch
rename meta/recipes-devtools/dpkg/{dpkg_1.20.9.bb => dpkg_1.21.1.bb} (88%)
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 80865a31a1..00b1e9187a 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -61,6 +61,8 @@ PROV:class-nativesdk = ""
PROVIDES += "${PROV}"
+FILES:${PN} += "${datadir}/zsh"
+
PACKAGES =+ "update-alternatives-dpkg"
FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
RPROVIDES:update-alternatives-dpkg += "update-alternatives"
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
index 2dc68e2064..4d3f238012 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -1,4 +1,4 @@
-From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001
+From cb47e9cd6735fcafd231748dab8884ae991b669c Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
Date: Tue, 16 Jun 2020 03:57:25 +0000
Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
-index d13a21c1e..059f2be6d 100644
+index 76613adec..7c216d1a9 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
-@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+@@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
{
int pipe_filenames[2], pipe_tarball[2];
pid_t pid_tar, pid_comp;
@@ -40,7 +40,7 @@ index d13a21c1e..059f2be6d 100644
/* Fork off a tar. We will feed it a list of filenames on stdin later. */
m_pipe(pipe_filenames);
-@@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+@@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
/* All done, clean up wait for tar and <compress> to finish their job. */
close(pipe_filenames[1]);
subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
diff --git a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch
deleted file mode 100644
index ece18a33ac..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@debian.org>
-Date: Fri, 28 May 2021 04:07:49 +0200
-Subject: [PATCH] arch: Add support for ARCv2 CPU
-
-This is based on the ARCv2 32-bit little-endian hard-float ISA.
-
-Closes: #980963
-
-Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d]
-
-Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
-Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
----
- data/cputable | 1 +
- scripts/Dpkg/Shlibs/Objdump.pm | 1 +
- scripts/t/Dpkg_Arch.t | 4 ++--
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/data/cputable b/data/cputable
-index 9f2a8e0e4..277bed88f 100644
---- a/data/cputable
-+++ b/data/cputable
-@@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little
- ia64 ia64 ia64 64 little
- alpha alpha alpha.* 64 little
- amd64 x86_64 (amd64|x86_64) 64 little
-+arc arc arc 32 little
- armeb armeb arm.*b 32 big
- arm arm arm.* 32 little
- arm64 aarch64 aarch64 64 little
-diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
-index 4cee866e7..93319d1eb 100644
---- a/scripts/Dpkg/Shlibs/Objdump.pm
-+++ b/scripts/Dpkg/Shlibs/Objdump.pm
-@@ -100,6 +100,7 @@ use constant {
- ELF_MACH_OR1K => 92,
- ELF_MACH_XTENSA => 94,
- ELF_MACH_MICROBLAZE => 189,
-+ ELF_MACH_ARCV2 => 195,
- ELF_MACH_AVR_OLD => 0x1057,
- ELF_MACH_OR1K_OLD => 0x8472,
- ELF_MACH_ALPHA => 0x9026,
-diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
-index a3a9e6fee..f0bba272a 100644
---- a/scripts/t/Dpkg_Arch.t
-+++ b/scripts/t/Dpkg_Arch.t
-@@ -16,7 +16,7 @@
- use strict;
- use warnings;
-
--use Test::More tests => 16836;
-+use Test::More tests => 18407;
-
- use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
- debarch_eq debarch_is debarch_is_wildcard
-@@ -174,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
- is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet');
- is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
-
--is(scalar get_valid_arches(), 539, 'expected amount of known architectures');
-+is(scalar get_valid_arches(), 554, 'expected amount of known architectures');
-
- {
- local $ENV{CC} = 'false';
---
-2.16.2
-
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
similarity index 88%
rename from meta/recipes-devtools/dpkg/dpkg_1.20.9.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
index 4c587f2bf2..ccb4f06d32 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
@@ -1,7 +1,7 @@
require dpkg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.x \
+SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \
file://noman.patch \
file://remove-tar-no-timestamp.patch \
file://arch_pm.patch \
@@ -14,11 +14,10 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.
file://0001-dpkg-Support-muslx32-build.patch \
file://pager.patch \
file://0001-Add-support-for-riscv32-CPU.patch \
- file://0014-arch-Add-support-for-ARCv2-CPU.patch \
"
SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
-SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3"
+SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151"
S = "${WORKDIR}/git"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1
2021-12-15 22:40 ` [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1 Alexander Kanavin
@ 2021-12-16 10:50 ` Alexey Brodkin
0 siblings, 0 replies; 32+ messages in thread
From: Alexey Brodkin @ 2021-12-16 10:50 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Alexander Kanavin, openembedded-core
Hi Alexander,
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Sent: Thursday, December 16, 2021 1:40 AM
> To: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>
> Cc: Alexander Kanavin <alex@linutronix.de>; Alexey Brodkin <abrodkin@synopsys.com>
> Subject: [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> meta/recipes-devtools/dpkg/dpkg.inc | 2 +
> ...ild.c-ignore-return-of-1-from-tar-cf.patch | 8 +--
> .../0014-arch-Add-support-for-ARCv2-CPU.patch | 68 -------------------
> .../dpkg/{dpkg_1.20.9.bb => dpkg_1.21.1.bb} | 5 +-
> 4 files changed, 8 insertions(+), 75 deletions(-)
> delete mode 100644 meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch
> rename meta/recipes-devtools/dpkg/{dpkg_1.20.9.bb => dpkg_1.21.1.bb} (88%)
...
> --- a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch
> +++ /dev/null
Thanks for taking care of that and ...
Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 16/26] go: upgrade 1.17.4 -> 1.17.5
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (13 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 15/26] dpkg: update 1.20.9 -> 1.21.1 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 17/26] repo: update 2.18 -> 2.19 Alexander Kanavin
` (9 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/go/{go-1.17.4.inc => go-1.17.5.inc} | 2 +-
...{go-binary-native_1.17.4.bb => go-binary-native_1.17.5.bb} | 4 ++--
...o-cross-canadian_1.17.4.bb => go-cross-canadian_1.17.5.bb} | 0
.../go/{go-cross_1.17.4.bb => go-cross_1.17.5.bb} | 0
.../go/{go-crosssdk_1.17.4.bb => go-crosssdk_1.17.5.bb} | 0
.../go/{go-native_1.17.4.bb => go-native_1.17.5.bb} | 0
.../go/{go-runtime_1.17.4.bb => go-runtime_1.17.5.bb} | 0
meta/recipes-devtools/go/{go_1.17.4.bb => go_1.17.5.bb} | 0
8 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/go/{go-1.17.4.inc => go-1.17.5.inc} (91%)
rename meta/recipes-devtools/go/{go-binary-native_1.17.4.bb => go-binary-native_1.17.5.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.17.4.bb => go-cross-canadian_1.17.5.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.17.4.bb => go-cross_1.17.5.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.17.4.bb => go-crosssdk_1.17.5.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.17.4.bb => go-native_1.17.5.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.17.4.bb => go-runtime_1.17.5.bb} (100%)
rename meta/recipes-devtools/go/{go_1.17.4.bb => go_1.17.5.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.17.4.inc b/meta/recipes-devtools/go/go-1.17.5.inc
similarity index 91%
rename from meta/recipes-devtools/go/go-1.17.4.inc
rename to meta/recipes-devtools/go/go-1.17.5.inc
index 5c4423ac18..baddd3b215 100644
--- a/meta/recipes-devtools/go/go-1.17.4.inc
+++ b/meta/recipes-devtools/go/go-1.17.5.inc
@@ -15,7 +15,7 @@ SRC_URI += "\
file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
"
-SRC_URI[main.sha256sum] = "4bef3699381ef09e075628504187416565d710660fec65b057edf1ceb187fc4b"
+SRC_URI[main.sha256sum] = "3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d"
# Upstream don't believe it is a signifiant real world issue and will only
# fix in 1.17 onwards where we can drop this.
diff --git a/meta/recipes-devtools/go/go-binary-native_1.17.4.bb b/meta/recipes-devtools/go/go-binary-native_1.17.5.bb
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.17.4.bb
rename to meta/recipes-devtools/go/go-binary-native_1.17.5.bb
index 8d8142ce1d..f07d299b40 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.17.4.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.17.5.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
PROVIDES = "go-native"
SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "adab2483f644e2f8a10ae93122f0018cef525ca48d0b8764dae87cb5f4fd4206"
-SRC_URI[go_linux_arm64.sha256sum] = "617a46bd083e59877bb5680998571b3ddd4f6dcdaf9f8bf65ad4edc8f3eafb13"
+SRC_URI[go_linux_amd64.sha256sum] = "bd78114b0d441b029c8fe0341f4910370925a4d270a6a590668840675b0c653e"
+SRC_URI[go_linux_arm64.sha256sum] = "6f95ce3da40d9ce1355e48f31f4eb6508382415ca4d7413b1e7a3314e6430e7e"
UPSTREAM_CHECK_URI = "https://golang.org/dl/"
UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.17.4.bb b/meta/recipes-devtools/go/go-cross-canadian_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.17.4.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.17.5.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.17.4.bb b/meta/recipes-devtools/go/go-cross_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.17.4.bb
rename to meta/recipes-devtools/go/go-cross_1.17.5.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.17.4.bb b/meta/recipes-devtools/go/go-crosssdk_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.17.4.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.17.5.bb
diff --git a/meta/recipes-devtools/go/go-native_1.17.4.bb b/meta/recipes-devtools/go/go-native_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.17.4.bb
rename to meta/recipes-devtools/go/go-native_1.17.5.bb
diff --git a/meta/recipes-devtools/go/go-runtime_1.17.4.bb b/meta/recipes-devtools/go/go-runtime_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.17.4.bb
rename to meta/recipes-devtools/go/go-runtime_1.17.5.bb
diff --git a/meta/recipes-devtools/go/go_1.17.4.bb b/meta/recipes-devtools/go/go_1.17.5.bb
similarity index 100%
rename from meta/recipes-devtools/go/go_1.17.4.bb
rename to meta/recipes-devtools/go/go_1.17.5.bb
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 17/26] repo: update 2.18 -> 2.19
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (14 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 16/26] go: upgrade 1.17.4 -> 1.17.5 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 18/26] boost: update 1.77.0 -> 1.78.0 Alexander Kanavin
` (8 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-devtools/repo/{repo_2.18.bb => repo_2.19.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/repo/{repo_2.18.bb => repo_2.19.bb} (88%)
diff --git a/meta/recipes-devtools/repo/repo_2.18.bb b/meta/recipes-devtools/repo/repo_2.19.bb
similarity index 88%
rename from meta/recipes-devtools/repo/repo_2.18.bb
rename to meta/recipes-devtools/repo/repo_2.19.bb
index bf5e8d0429..730540cfa0 100644
--- a/meta/recipes-devtools/repo/repo_2.18.bb
+++ b/meta/recipes-devtools/repo/repo_2.19.bb
@@ -9,10 +9,10 @@ SECTION = "console/utils"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main"
-SRCREV = "4a478edb443864561089b2699c9e65c85fc5e036"
-
-SRC_URI += "file://0001-python3-shebang.patch"
+SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
+ file://0001-python3-shebang.patch \
+ "
+SRCREV = "2a089cfee4a3eb0c28cfb441861fc1fcb05797d3"
MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 18/26] boost: update 1.77.0 -> 1.78.0
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (15 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 17/26] repo: update 2.18 -> 2.19 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 23:28 ` Khem Raj
2021-12-15 22:40 ` [PATCH 19/26] libptytty: add recipe Alexander Kanavin
` (7 subsequent siblings)
24 siblings, 1 reply; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core
Cc: Alexander Kanavin, Martin Jansa, Khem Raj, Michael Nosthoff
Drop backports.
Drop 0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch as
it is difficult to rebase and needs to land upstream first.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../{boost-1.77.0.inc => boost-1.78.0.inc} | 2 +-
....cmake-allow-searching-for-python310.patch | 50 ------
...h-instruction-set-flags-we-do-that-o.patch | 15 +-
...efine-SYS_futex-if-it-does-not-exist.patch | 54 -------
...th_no_atomic_int-on-the-command-line.patch | 53 ------
...oft-failure-in-bernoulli_details_hpp.patch | 151 ------------------
...7e01635306085488290ea83de541ec393f8b.patch | 30 ++++
meta/recipes-support/boost/boost_1.77.0.bb | 12 --
meta/recipes-support/boost/boost_1.78.0.bb | 9 ++
9 files changed, 50 insertions(+), 326 deletions(-)
rename meta/recipes-support/boost/{boost-1.77.0.inc => boost-1.78.0.inc} (90%)
delete mode 100644 meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
delete mode 100644 meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
delete mode 100644 meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
delete mode 100644 meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
create mode 100644 meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
delete mode 100644 meta/recipes-support/boost/boost_1.77.0.bb
create mode 100644 meta/recipes-support/boost/boost_1.78.0.bb
diff --git a/meta/recipes-support/boost/boost-1.77.0.inc b/meta/recipes-support/boost/boost-1.78.0.inc
similarity index 90%
rename from meta/recipes-support/boost/boost-1.77.0.inc
rename to meta/recipes-support/boost/boost-1.78.0.inc
index 6df06e76c7..729a47b54f 100644
--- a/meta/recipes-support/boost/boost-1.77.0.inc
+++ b/meta/recipes-support/boost/boost-1.78.0.inc
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
BOOST_P = "boost_${BOOST_VER}"
SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
-SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
+SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch b/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
deleted file mode 100644
index 0a9ee2cc95..0000000000
--- a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 19 Oct 2021 12:24:31 +0000
-Subject: [PATCH] BoostConfig.cmake: allow searching for python310
-
-* accept double digits in Python3_VERSION_MINOR
-
-* if someone is using e.g.:
- find_package(Python3 REQUIRED)
- find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-
- with python-3.10 then it currently fails with:
-
- -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0")
- -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter
- CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package):
- Could not find a package configuration file provided by "boost_python310"
- (requested version 1.77.0) with any of the following names:
-
- boost_python310Config.cmake
- boost_python310-config.cmake
-
- Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or
- set "boost_python310_DIR" to a directory containing one of the above files.
- If "boost_python310" provides a separate development package or SDK, be
- sure it has been installed.
- Call Stack (most recent call first):
- /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component)
- /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
- CMakeLists.txt:18 (find_package)
-
-Upstream-Status: Submitted [https://github.com/boostorg/boost_install/pull/53]
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- tools/boost_install/BoostConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/boost_install/BoostConfig.cmake b/tools/boost_install/BoostConfig.cmake
-index fd17821..5dffa58 100644
---- a/tools/boost_install/BoostConfig.cmake
-+++ b/tools/boost_install/BoostConfig.cmake
-@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
- set(_BOOST_REQUIRED REQUIRED)
- endif()
-
-- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
-+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
-
- # handle pythonXY and numpyXY versioned components for compatibility
-
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
index 91ab53efd9..67d5dff125 100644
--- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
+++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
@@ -1,4 +1,4 @@
-From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001
+From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 18 Dec 2018 15:42:57 +0100
Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- tools/build/src/tools/gcc.jam | 139 ----------------------------------
- 1 file changed, 139 deletions(-)
+ tools/build/src/tools/gcc.jam | 144 ----------------------------------
+ 1 file changed, 144 deletions(-)
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index ff3209f7b..70cbc39a5 100644
+index 47a113223..d77525724 100644
--- a/tools/build/src/tools/gcc.jam
+++ b/tools/build/src/tools/gcc.jam
-@@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
+@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
<architecture>$(architecture)/<instruction-set>$(instruction-set)
: $(values) ;
}
@@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644
-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
-cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
+-# ARM
+-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
+-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
+-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
+-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
-# AIX variant of RS/6000 & PowerPC
-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
deleted file mode 100644
index 523568e9bc..0000000000
--- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Oct 2020 11:13:22 -0700
-Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist
-
-__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
-they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on
-__NR_futex, since this is used in applications, such applications start
-to fail to build for these newer architectures. This patch defines a
-fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
-working
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- boost/fiber/detail/futex.hpp | 5 +++++
- libs/log/src/event.cpp | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
-index e64bd5990..16bee64f1 100644
---- a/boost/fiber/detail/futex.hpp
-+++ b/boost/fiber/detail/futex.hpp
-@@ -17,6 +17,11 @@ extern "C" {
- #include <linux/futex.h>
- #include <sys/syscall.h>
- }
-+
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+#define SYS_futex SYS_futex_time64
-+#endif
-+
- #elif BOOST_OS_WINDOWS
- #include <windows.h>
- #endif
-diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
-index 5485154d7..2c7c0381f 100644
---- a/libs/log/src/event.cpp
-+++ b/libs/log/src/event.cpp
-@@ -31,6 +31,10 @@
- #include <linux/futex.h>
- #include <boost/memory_order.hpp>
-
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+#define SYS_futex SYS_futex_time64
-+#endif
-+
- // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex
- #if defined(SYS_futex)
- #define BOOST_LOG_SYS_FUTEX SYS_futex
---
-2.28.0
-
diff --git a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch b/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
deleted file mode 100644
index b05b795084..0000000000
--- a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001
-From: jzmaddock <john@johnmaddock.co.uk>
-Date: Wed, 1 Sep 2021 18:54:54 +0100
-Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command
- line. Allows us to test/emulate platforms with no atomic integers.
-
-[buildroot@heine.tech:
- - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc
- - alter path to match boost release
-]
-Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
----
-Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/32bd6197353f6ea8e5bef01f09e25c944141acfc]
- boost/math/tools/atomic.hpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp
-index cc76ed269f..e3cbf5db89 100644
---- a/boost/math/tools/atomic.hpp
-+++ b/boost/math/tools/atomic.hpp
-@@ -16,27 +16,27 @@
- namespace boost {
- namespace math {
- namespace detail {
--#if ATOMIC_INT_LOCK_FREE == 2
-+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
- typedef std::atomic<int> atomic_counter_type;
- typedef std::atomic<unsigned> atomic_unsigned_type;
- typedef int atomic_integer_type;
- typedef unsigned atomic_unsigned_integer_type;
--#elif ATOMIC_SHORT_LOCK_FREE == 2
-+#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
- typedef std::atomic<short> atomic_counter_type;
- typedef std::atomic<unsigned short> atomic_unsigned_type;
- typedef short atomic_integer_type;
- typedef unsigned short atomic_unsigned_type;
--#elif ATOMIC_LONG_LOCK_FREE == 2
-+#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
- typedef std::atomic<long> atomic_unsigned_integer_type;
- typedef std::atomic<unsigned long> atomic_unsigned_type;
- typedef unsigned long atomic_unsigned_type;
- typedef long atomic_integer_type;
--#elif ATOMIC_LLONG_LOCK_FREE == 2
-+#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
- typedef std::atomic<long long> atomic_unsigned_integer_type;
- typedef std::atomic<unsigned long long> atomic_unsigned_type;
- typedef long long atomic_integer_type;
- typedef unsigned long long atomic_unsigned_integer_type;
--#else
-+#elif !defined(BOOST_MATH_NO_ATOMIC_INT)
- # define BOOST_MATH_NO_ATOMIC_INT
- #endif
- } // Namespace detail
diff --git a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch b/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
deleted file mode 100644
index f69e4f21f3..0000000000
--- a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001
-From: jzmaddock <john@johnmaddock.co.uk>
-Date: Wed, 1 Sep 2021 20:31:53 +0100
-Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp.
- Include an "escape macro" so thread safety can be disabled if certain
- bernoulli features are to be used in a no-atomics environment. Fixes
- https://github.com/boostorg/math/issues/673.
-
-[buildroot@heine.tech:
- - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b
- - alter path to match boost release
-]
-Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
----
-Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b]
- .../detail/bernoulli_details.hpp | 10 +++++++---
- libs/math/test/Jamfile.v2 | 3 +++
- test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++
- test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++
- test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++
- 5 files changed, 55 insertions(+), 3 deletions(-)
- create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp
- create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp
- create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp
-
-diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp b/boost/math/special_functions/detail/bernoulli_details.hpp
-index cf35545264..8519b7c89c 100644
---- a/boost/math/special_functions/detail/bernoulli_details.hpp
-+++ b/boost/math/special_functions/detail/bernoulli_details.hpp
-@@ -360,7 +360,7 @@ class bernoulli_numbers_cache
- return out;
- }
-
-- #ifndef BOOST_HAS_THREADS
-+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
- //
- // Single threaded code, very simple:
- //
-@@ -382,6 +382,8 @@ class bernoulli_numbers_cache
- *out = (i >= m_overflow_limit) ? policies::raise_overflow_error<T>("boost::math::bernoulli_b2n<%1%>(std::size_t)", 0, T(i), pol) : bn[i];
- ++out;
- }
-+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
-+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
- #else
- //
- // Double-checked locking pattern, lets us access cached already cached values
-@@ -464,7 +466,7 @@ class bernoulli_numbers_cache
- return out;
- }
-
-- #ifndef BOOST_HAS_THREADS
-+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
- //
- // Single threaded code, very simple:
- //
-@@ -494,6 +496,8 @@ class bernoulli_numbers_cache
- }
- ++out;
- }
-+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
-+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
- #else
- //
- // Double-checked locking pattern, lets us access cached already cached values
-@@ -555,7 +559,7 @@ class bernoulli_numbers_cache
- // The value at which we know overflow has already occurred for the Bn:
- std::size_t m_overflow_limit;
-
-- #ifdef BOOST_HAS_THREADS
-+ #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT)
- std::mutex m_mutex;
- atomic_counter_type m_counter, m_current_precision;
- #else
-diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2
-index 52fb87f5e5..3ac63f9279 100644
---- a/libs/math/test/Jamfile.v2
-+++ b/libs/math/test/Jamfile.v2
-@@ -1137,6 +1137,9 @@ test-suite misc :
-
- # [ run __temporary_test.cpp test_instances//test_instances : : : <test-info>always_show_run_output <pch>off ]
- [ compile test_no_long_double_policy.cpp ]
-+ [ compile compile_test/bernoulli_no_atomic_d.cpp ]
-+ [ compile compile_test/bernoulli_no_atomic_mp.cpp ]
-+ [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ]
- ;
-
- test-suite interpolators :
-diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp b/test/compile_test/bernoulli_no_atomic_d.cpp
-new file mode 100644
-index 0000000000..61926f7e1f
---- /dev/null
-+++ b/test/compile_test/bernoulli_no_atomic_d.cpp
-@@ -0,0 +1,14 @@
-+// (C) Copyright John Maddock 2021.
-+// Use, modification and distribution are subject to the
-+// Boost Software License, Version 1.0. (See accompanying file
-+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+#define BOOST_MATH_NO_ATOMIC_INT
-+
-+#include <boost/math/special_functions/bernoulli.hpp>
-+#include "test_compile_result.hpp"
-+
-+void compile_and_link_test()
-+{
-+ check_result<double>(boost::math::bernoulli_b2n<double>(4));
-+}
-diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp b/test/compile_test/bernoulli_no_atomic_fail.cpp
-new file mode 100644
-index 0000000000..bbd7152412
---- /dev/null
-+++ b/test/compile_test/bernoulli_no_atomic_fail.cpp
-@@ -0,0 +1,15 @@
-+// (C) Copyright John Maddock 2021.
-+// Use, modification and distribution are subject to the
-+// Boost Software License, Version 1.0. (See accompanying file
-+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+#define BOOST_MATH_NO_ATOMIC_INT
-+
-+#include <boost/math/special_functions/bernoulli.hpp>
-+#include <boost/multiprecision/cpp_bin_float.hpp>
-+#include "test_compile_result.hpp"
-+
-+void compile_and_link_test()
-+{
-+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
-+}
-diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp b/test/compile_test/bernoulli_no_atomic_mp.cpp
-new file mode 100644
-index 0000000000..8d5a6e78e6
---- /dev/null
-+++ b/test/compile_test/bernoulli_no_atomic_mp.cpp
-@@ -0,0 +1,16 @@
-+// (C) Copyright John Maddock 2021.
-+// Use, modification and distribution are subject to the
-+// Boost Software License, Version 1.0. (See accompanying file
-+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+#define BOOST_MATH_NO_ATOMIC_INT
-+#define BOOST_MATH_BERNOULLI_UNTHREADED
-+
-+#include <boost/math/special_functions/bernoulli.hpp>
-+#include <boost/multiprecision/cpp_bin_float.hpp>
-+#include "test_compile_result.hpp"
-+
-+void compile_and_link_test()
-+{
-+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
-+}
diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
new file mode 100644
index 0000000000..867ec03ba6
--- /dev/null
+++ b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
@@ -0,0 +1,30 @@
+From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001
+From: Leonardo Neumann <leonardo@neumann.dev.br>
+Date: Mon, 13 Dec 2021 01:07:20 -0300
+Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
+
+Boost 1.78.0 fails to build on musl-based systems because musl does
+not include sys/stat.h by default.
+
+Fixes #161 ("Boost compiler error")
+Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ include/boost/interprocess/permissions.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp
+index ab55411e..0b21a685 100644
+--- a/boost/interprocess/permissions.hpp
++++ b/boost/interprocess/permissions.hpp
+@@ -29,6 +29,10 @@
+
+ #include <boost/interprocess/detail/win32_api.hpp>
+
++#else
++
++#include <sys/stat.h>
++
+ #endif
+
+ #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
diff --git a/meta/recipes-support/boost/boost_1.77.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb
deleted file mode 100644
index bde6b14a79..0000000000
--- a/meta/recipes-support/boost/boost_1.77.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require boost-${PV}.inc
-require boost.inc
-
-SRC_URI += "file://boost-CVE-2012-2677.patch \
- file://boost-math-disable-pch-for-gcc.patch \
- file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
- file://0001-dont-setup-compiler-flags-m32-m64.patch \
- file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
- file://0001-BoostConfig.cmake-allow-searching-for-python310.patch \
- file://0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch \
- file://0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch \
- "
diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb
new file mode 100644
index 0000000000..f4b6ed8576
--- /dev/null
+++ b/meta/recipes-support/boost/boost_1.78.0.bb
@@ -0,0 +1,9 @@
+require boost-${PV}.inc
+require boost.inc
+
+SRC_URI += "file://boost-CVE-2012-2677.patch \
+ file://boost-math-disable-pch-for-gcc.patch \
+ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
+ file://0001-dont-setup-compiler-flags-m32-m64.patch \
+ file://de657e01635306085488290ea83de541ec393f8b.patch \
+ "
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH 18/26] boost: update 1.77.0 -> 1.78.0
2021-12-15 22:40 ` [PATCH 18/26] boost: update 1.77.0 -> 1.78.0 Alexander Kanavin
@ 2021-12-15 23:28 ` Khem Raj
2021-12-16 8:28 ` Alexander Kanavin
0 siblings, 1 reply; 32+ messages in thread
From: Khem Raj @ 2021-12-15 23:28 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Martin Jansa, Michael Nosthoff
On Wed, Dec 15, 2021 at 2:40 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop backports.
>
> Drop 0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch as
> it is difficult to rebase and needs to land upstream first.
It's not that rebasing is too hard for this patch but this patch is an
incorrect way to fix what it's trying to solve and that's why I am
fine with dropping it.
landing upstream is not a precondition for submitting patches to
OpenEmbedded but good to have. All distributions carry patches and as
long as patches are working
their way upstream asynchronously its ok. Let's not make it too hard
for contributors and chase them away.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> .../{boost-1.77.0.inc => boost-1.78.0.inc} | 2 +-
> ....cmake-allow-searching-for-python310.patch | 50 ------
> ...h-instruction-set-flags-we-do-that-o.patch | 15 +-
> ...efine-SYS_futex-if-it-does-not-exist.patch | 54 -------
> ...th_no_atomic_int-on-the-command-line.patch | 53 ------
> ...oft-failure-in-bernoulli_details_hpp.patch | 151 ------------------
> ...7e01635306085488290ea83de541ec393f8b.patch | 30 ++++
> meta/recipes-support/boost/boost_1.77.0.bb | 12 --
> meta/recipes-support/boost/boost_1.78.0.bb | 9 ++
> 9 files changed, 50 insertions(+), 326 deletions(-)
> rename meta/recipes-support/boost/{boost-1.77.0.inc => boost-1.78.0.inc} (90%)
> delete mode 100644 meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> delete mode 100644 meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> delete mode 100644 meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> delete mode 100644 meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> create mode 100644 meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> delete mode 100644 meta/recipes-support/boost/boost_1.77.0.bb
> create mode 100644 meta/recipes-support/boost/boost_1.78.0.bb
>
> diff --git a/meta/recipes-support/boost/boost-1.77.0.inc b/meta/recipes-support/boost/boost-1.78.0.inc
> similarity index 90%
> rename from meta/recipes-support/boost/boost-1.77.0.inc
> rename to meta/recipes-support/boost/boost-1.78.0.inc
> index 6df06e76c7..729a47b54f 100644
> --- a/meta/recipes-support/boost/boost-1.77.0.inc
> +++ b/meta/recipes-support/boost/boost-1.78.0.inc
> @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
> BOOST_P = "boost_${BOOST_VER}"
>
> SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
> -SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
> +SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"
>
> UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
> UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
> diff --git a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch b/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> deleted file mode 100644
> index 0a9ee2cc95..0000000000
> --- a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Tue, 19 Oct 2021 12:24:31 +0000
> -Subject: [PATCH] BoostConfig.cmake: allow searching for python310
> -
> -* accept double digits in Python3_VERSION_MINOR
> -
> -* if someone is using e.g.:
> - find_package(Python3 REQUIRED)
> - find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
> -
> - with python-3.10 then it currently fails with:
> -
> - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0")
> - -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter
> - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package):
> - Could not find a package configuration file provided by "boost_python310"
> - (requested version 1.77.0) with any of the following names:
> -
> - boost_python310Config.cmake
> - boost_python310-config.cmake
> -
> - Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or
> - set "boost_python310_DIR" to a directory containing one of the above files.
> - If "boost_python310" provides a separate development package or SDK, be
> - sure it has been installed.
> - Call Stack (most recent call first):
> - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component)
> - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
> - CMakeLists.txt:18 (find_package)
> -
> -Upstream-Status: Submitted [https://github.com/boostorg/boost_install/pull/53]
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - tools/boost_install/BoostConfig.cmake | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/tools/boost_install/BoostConfig.cmake b/tools/boost_install/BoostConfig.cmake
> -index fd17821..5dffa58 100644
> ---- a/tools/boost_install/BoostConfig.cmake
> -+++ b/tools/boost_install/BoostConfig.cmake
> -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
> - set(_BOOST_REQUIRED REQUIRED)
> - endif()
> -
> -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
> -+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
> -
> - # handle pythonXY and numpyXY versioned components for compatibility
> -
> diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> index 91ab53efd9..67d5dff125 100644
> --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> @@ -1,4 +1,4 @@
> -From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001
> +From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Tue, 18 Dec 2018 15:42:57 +0100
> Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
> @@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>
> ---
> - tools/build/src/tools/gcc.jam | 139 ----------------------------------
> - 1 file changed, 139 deletions(-)
> + tools/build/src/tools/gcc.jam | 144 ----------------------------------
> + 1 file changed, 144 deletions(-)
>
> diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
> -index ff3209f7b..70cbc39a5 100644
> +index 47a113223..d77525724 100644
> --- a/tools/build/src/tools/gcc.jam
> +++ b/tools/build/src/tools/gcc.jam
> -@@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
> +@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
> <architecture>$(architecture)/<instruction-set>$(instruction-set)
> : $(values) ;
> }
> @@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644
> -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
> -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
> -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
> +-# ARM
> +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
> +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
> +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
> +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
> -# AIX variant of RS/6000 & PowerPC
> -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
> diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> deleted file mode 100644
> index 523568e9bc..0000000000
> --- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 16 Oct 2020 11:13:22 -0700
> -Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist
> -
> -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
> -they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on
> -__NR_futex, since this is used in applications, such applications start
> -to fail to build for these newer architectures. This patch defines a
> -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
> -working
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - boost/fiber/detail/futex.hpp | 5 +++++
> - libs/log/src/event.cpp | 4 ++++
> - 2 files changed, 9 insertions(+)
> -
> -diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
> -index e64bd5990..16bee64f1 100644
> ---- a/boost/fiber/detail/futex.hpp
> -+++ b/boost/fiber/detail/futex.hpp
> -@@ -17,6 +17,11 @@ extern "C" {
> - #include <linux/futex.h>
> - #include <sys/syscall.h>
> - }
> -+
> -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
> -+#define SYS_futex SYS_futex_time64
> -+#endif
> -+
> - #elif BOOST_OS_WINDOWS
> - #include <windows.h>
> - #endif
> -diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
> -index 5485154d7..2c7c0381f 100644
> ---- a/libs/log/src/event.cpp
> -+++ b/libs/log/src/event.cpp
> -@@ -31,6 +31,10 @@
> - #include <linux/futex.h>
> - #include <boost/memory_order.hpp>
> -
> -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
> -+#define SYS_futex SYS_futex_time64
> -+#endif
> -+
> - // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex
> - #if defined(SYS_futex)
> - #define BOOST_LOG_SYS_FUTEX SYS_futex
> ---
> -2.28.0
> -
> diff --git a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch b/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> deleted file mode 100644
> index b05b795084..0000000000
> --- a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001
> -From: jzmaddock <john@johnmaddock.co.uk>
> -Date: Wed, 1 Sep 2021 18:54:54 +0100
> -Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command
> - line. Allows us to test/emulate platforms with no atomic integers.
> -
> -[buildroot@heine.tech:
> - - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc
> - - alter path to match boost release
> -]
> -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
> ----
> -Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/32bd6197353f6ea8e5bef01f09e25c944141acfc]
> - boost/math/tools/atomic.hpp | 10 +++++-----
> - 1 file changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp
> -index cc76ed269f..e3cbf5db89 100644
> ---- a/boost/math/tools/atomic.hpp
> -+++ b/boost/math/tools/atomic.hpp
> -@@ -16,27 +16,27 @@
> - namespace boost {
> - namespace math {
> - namespace detail {
> --#if ATOMIC_INT_LOCK_FREE == 2
> -+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> - typedef std::atomic<int> atomic_counter_type;
> - typedef std::atomic<unsigned> atomic_unsigned_type;
> - typedef int atomic_integer_type;
> - typedef unsigned atomic_unsigned_integer_type;
> --#elif ATOMIC_SHORT_LOCK_FREE == 2
> -+#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> - typedef std::atomic<short> atomic_counter_type;
> - typedef std::atomic<unsigned short> atomic_unsigned_type;
> - typedef short atomic_integer_type;
> - typedef unsigned short atomic_unsigned_type;
> --#elif ATOMIC_LONG_LOCK_FREE == 2
> -+#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> - typedef std::atomic<long> atomic_unsigned_integer_type;
> - typedef std::atomic<unsigned long> atomic_unsigned_type;
> - typedef unsigned long atomic_unsigned_type;
> - typedef long atomic_integer_type;
> --#elif ATOMIC_LLONG_LOCK_FREE == 2
> -+#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> - typedef std::atomic<long long> atomic_unsigned_integer_type;
> - typedef std::atomic<unsigned long long> atomic_unsigned_type;
> - typedef long long atomic_integer_type;
> - typedef unsigned long long atomic_unsigned_integer_type;
> --#else
> -+#elif !defined(BOOST_MATH_NO_ATOMIC_INT)
> - # define BOOST_MATH_NO_ATOMIC_INT
> - #endif
> - } // Namespace detail
> diff --git a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch b/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> deleted file mode 100644
> index f69e4f21f3..0000000000
> --- a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> +++ /dev/null
> @@ -1,151 +0,0 @@
> -From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001
> -From: jzmaddock <john@johnmaddock.co.uk>
> -Date: Wed, 1 Sep 2021 20:31:53 +0100
> -Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp.
> - Include an "escape macro" so thread safety can be disabled if certain
> - bernoulli features are to be used in a no-atomics environment. Fixes
> - https://github.com/boostorg/math/issues/673.
> -
> -[buildroot@heine.tech:
> - - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b
> - - alter path to match boost release
> -]
> -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
> ----
> -Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b]
> - .../detail/bernoulli_details.hpp | 10 +++++++---
> - libs/math/test/Jamfile.v2 | 3 +++
> - test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++
> - test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++
> - test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++
> - 5 files changed, 55 insertions(+), 3 deletions(-)
> - create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp
> - create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp
> - create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp
> -
> -diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp b/boost/math/special_functions/detail/bernoulli_details.hpp
> -index cf35545264..8519b7c89c 100644
> ---- a/boost/math/special_functions/detail/bernoulli_details.hpp
> -+++ b/boost/math/special_functions/detail/bernoulli_details.hpp
> -@@ -360,7 +360,7 @@ class bernoulli_numbers_cache
> - return out;
> - }
> -
> -- #ifndef BOOST_HAS_THREADS
> -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
> - //
> - // Single threaded code, very simple:
> - //
> -@@ -382,6 +382,8 @@ class bernoulli_numbers_cache
> - *out = (i >= m_overflow_limit) ? policies::raise_overflow_error<T>("boost::math::bernoulli_b2n<%1%>(std::size_t)", 0, T(i), pol) : bn[i];
> - ++out;
> - }
> -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
> -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
> - #else
> - //
> - // Double-checked locking pattern, lets us access cached already cached values
> -@@ -464,7 +466,7 @@ class bernoulli_numbers_cache
> - return out;
> - }
> -
> -- #ifndef BOOST_HAS_THREADS
> -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
> - //
> - // Single threaded code, very simple:
> - //
> -@@ -494,6 +496,8 @@ class bernoulli_numbers_cache
> - }
> - ++out;
> - }
> -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
> -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
> - #else
> - //
> - // Double-checked locking pattern, lets us access cached already cached values
> -@@ -555,7 +559,7 @@ class bernoulli_numbers_cache
> - // The value at which we know overflow has already occurred for the Bn:
> - std::size_t m_overflow_limit;
> -
> -- #ifdef BOOST_HAS_THREADS
> -+ #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> - std::mutex m_mutex;
> - atomic_counter_type m_counter, m_current_precision;
> - #else
> -diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2
> -index 52fb87f5e5..3ac63f9279 100644
> ---- a/libs/math/test/Jamfile.v2
> -+++ b/libs/math/test/Jamfile.v2
> -@@ -1137,6 +1137,9 @@ test-suite misc :
> -
> - # [ run __temporary_test.cpp test_instances//test_instances : : : <test-info>always_show_run_output <pch>off ]
> - [ compile test_no_long_double_policy.cpp ]
> -+ [ compile compile_test/bernoulli_no_atomic_d.cpp ]
> -+ [ compile compile_test/bernoulli_no_atomic_mp.cpp ]
> -+ [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ]
> - ;
> -
> - test-suite interpolators :
> -diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp b/test/compile_test/bernoulli_no_atomic_d.cpp
> -new file mode 100644
> -index 0000000000..61926f7e1f
> ---- /dev/null
> -+++ b/test/compile_test/bernoulli_no_atomic_d.cpp
> -@@ -0,0 +1,14 @@
> -+// (C) Copyright John Maddock 2021.
> -+// Use, modification and distribution are subject to the
> -+// Boost Software License, Version 1.0. (See accompanying file
> -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> -+
> -+#define BOOST_MATH_NO_ATOMIC_INT
> -+
> -+#include <boost/math/special_functions/bernoulli.hpp>
> -+#include "test_compile_result.hpp"
> -+
> -+void compile_and_link_test()
> -+{
> -+ check_result<double>(boost::math::bernoulli_b2n<double>(4));
> -+}
> -diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp b/test/compile_test/bernoulli_no_atomic_fail.cpp
> -new file mode 100644
> -index 0000000000..bbd7152412
> ---- /dev/null
> -+++ b/test/compile_test/bernoulli_no_atomic_fail.cpp
> -@@ -0,0 +1,15 @@
> -+// (C) Copyright John Maddock 2021.
> -+// Use, modification and distribution are subject to the
> -+// Boost Software License, Version 1.0. (See accompanying file
> -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> -+
> -+#define BOOST_MATH_NO_ATOMIC_INT
> -+
> -+#include <boost/math/special_functions/bernoulli.hpp>
> -+#include <boost/multiprecision/cpp_bin_float.hpp>
> -+#include "test_compile_result.hpp"
> -+
> -+void compile_and_link_test()
> -+{
> -+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
> -+}
> -diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp b/test/compile_test/bernoulli_no_atomic_mp.cpp
> -new file mode 100644
> -index 0000000000..8d5a6e78e6
> ---- /dev/null
> -+++ b/test/compile_test/bernoulli_no_atomic_mp.cpp
> -@@ -0,0 +1,16 @@
> -+// (C) Copyright John Maddock 2021.
> -+// Use, modification and distribution are subject to the
> -+// Boost Software License, Version 1.0. (See accompanying file
> -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> -+
> -+#define BOOST_MATH_NO_ATOMIC_INT
> -+#define BOOST_MATH_BERNOULLI_UNTHREADED
> -+
> -+#include <boost/math/special_functions/bernoulli.hpp>
> -+#include <boost/multiprecision/cpp_bin_float.hpp>
> -+#include "test_compile_result.hpp"
> -+
> -+void compile_and_link_test()
> -+{
> -+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
> -+}
> diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> new file mode 100644
> index 0000000000..867ec03ba6
> --- /dev/null
> +++ b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> @@ -0,0 +1,30 @@
> +From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001
> +From: Leonardo Neumann <leonardo@neumann.dev.br>
> +Date: Mon, 13 Dec 2021 01:07:20 -0300
> +Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
> +
> +Boost 1.78.0 fails to build on musl-based systems because musl does
> +not include sys/stat.h by default.
> +
> +Fixes #161 ("Boost compiler error")
> +Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + include/boost/interprocess/permissions.hpp | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp
> +index ab55411e..0b21a685 100644
> +--- a/boost/interprocess/permissions.hpp
> ++++ b/boost/interprocess/permissions.hpp
> +@@ -29,6 +29,10 @@
> +
> + #include <boost/interprocess/detail/win32_api.hpp>
> +
> ++#else
> ++
> ++#include <sys/stat.h>
> ++
> + #endif
> +
> + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
> diff --git a/meta/recipes-support/boost/boost_1.77.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb
> deleted file mode 100644
> index bde6b14a79..0000000000
> --- a/meta/recipes-support/boost/boost_1.77.0.bb
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -require boost-${PV}.inc
> -require boost.inc
> -
> -SRC_URI += "file://boost-CVE-2012-2677.patch \
> - file://boost-math-disable-pch-for-gcc.patch \
> - file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
> - file://0001-dont-setup-compiler-flags-m32-m64.patch \
> - file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
> - file://0001-BoostConfig.cmake-allow-searching-for-python310.patch \
> - file://0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch \
> - file://0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch \
> - "
> diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb
> new file mode 100644
> index 0000000000..f4b6ed8576
> --- /dev/null
> +++ b/meta/recipes-support/boost/boost_1.78.0.bb
> @@ -0,0 +1,9 @@
> +require boost-${PV}.inc
> +require boost.inc
> +
> +SRC_URI += "file://boost-CVE-2012-2677.patch \
> + file://boost-math-disable-pch-for-gcc.patch \
> + file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
> + file://0001-dont-setup-compiler-flags-m32-m64.patch \
> + file://de657e01635306085488290ea83de541ec393f8b.patch \
> + "
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 18/26] boost: update 1.77.0 -> 1.78.0
2021-12-15 23:28 ` Khem Raj
@ 2021-12-16 8:28 ` Alexander Kanavin
2021-12-16 17:07 ` Khem Raj
0 siblings, 1 reply; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-16 8:28 UTC (permalink / raw)
To: Khem Raj
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Martin Jansa, Michael Nosthoff
[-- Attachment #1: Type: text/plain, Size: 25602 bytes --]
On Thu, 16 Dec 2021 at 00:28, Khem Raj <raj.khem@gmail.com> wrote:
> > Drop 0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch as
> > it is difficult to rebase and needs to land upstream first.
>
> It's not that rebasing is too hard for this patch but this patch is an
> incorrect way to fix what it's trying to solve and that's why I am
> fine with dropping it.
> landing upstream is not a precondition for submitting patches to
> OpenEmbedded but good to have. All distributions carry patches and as
> long as patches are working
> their way upstream asynchronously its ok. Let's not make it too hard
> for contributors and chase them away.
>
Yes, rather than 'land upstream' I should've said 'submitted upstream' -
that patch is dated 16 October 2020, and it never happened. While myself
and everyone else enormously appreciate your toolchain and target work,
there's a problem with amassing invasive pending patches related to that:
no one except you truly understands them. So what I'm asking is just a bit
more rigor going forward: submit patches upstream at the same time you
submit them to core, and steadily work your way towards reducing the pile
that's already there.
Alex
>
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> > .../{boost-1.77.0.inc => boost-1.78.0.inc} | 2 +-
> > ....cmake-allow-searching-for-python310.patch | 50 ------
> > ...h-instruction-set-flags-we-do-that-o.patch | 15 +-
> > ...efine-SYS_futex-if-it-does-not-exist.patch | 54 -------
> > ...th_no_atomic_int-on-the-command-line.patch | 53 ------
> > ...oft-failure-in-bernoulli_details_hpp.patch | 151 ------------------
> > ...7e01635306085488290ea83de541ec393f8b.patch | 30 ++++
> > meta/recipes-support/boost/boost_1.77.0.bb | 12 --
> > meta/recipes-support/boost/boost_1.78.0.bb | 9 ++
> > 9 files changed, 50 insertions(+), 326 deletions(-)
> > rename meta/recipes-support/boost/{boost-1.77.0.inc =>
> boost-1.78.0.inc} (90%)
> > delete mode 100644
> meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> > delete mode 100644
> meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> > delete mode 100644
> meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> > delete mode 100644
> meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> > create mode 100644
> meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> > delete mode 100644 meta/recipes-support/boost/boost_1.77.0.bb
> > create mode 100644 meta/recipes-support/boost/boost_1.78.0.bb
> >
> > diff --git a/meta/recipes-support/boost/boost-1.77.0.inc
> b/meta/recipes-support/boost/boost-1.78.0.inc
> > similarity index 90%
> > rename from meta/recipes-support/boost/boost-1.77.0.inc
> > rename to meta/recipes-support/boost/boost-1.78.0.inc
> > index 6df06e76c7..729a47b54f 100644
> > --- a/meta/recipes-support/boost/boost-1.77.0.inc
> > +++ b/meta/recipes-support/boost/boost-1.78.0.inc
> > @@ -12,7 +12,7 @@ BOOST_MAJ =
> "${@"_".join(d.getVar("PV").split(".")[0:2])}"
> > BOOST_P = "boost_${BOOST_VER}"
> >
> > SRC_URI = "
> https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2
> "
> > -SRC_URI[sha256sum] =
> "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
> > +SRC_URI[sha256sum] =
> "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"
> >
> > UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
> > UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
> > diff --git
> a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> b/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> > deleted file mode 100644
> > index 0a9ee2cc95..0000000000
> > ---
> a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
> > +++ /dev/null
> > @@ -1,50 +0,0 @@
> > -From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001
> > -From: Martin Jansa <Martin.Jansa@gmail.com>
> > -Date: Tue, 19 Oct 2021 12:24:31 +0000
> > -Subject: [PATCH] BoostConfig.cmake: allow searching for python310
> > -
> > -* accept double digits in Python3_VERSION_MINOR
> > -
> > -* if someone is using e.g.:
> > - find_package(Python3 REQUIRED)
> > - find_package(Boost REQUIRED
> python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
> > -
> > - with python-3.10 then it currently fails with:
> > -
> > - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version
> "3.10.0")
> > - -- Found Python3: -native/usr/bin/python3-native/python3 (found
> version "3.10.0") found components: Interpreter
> > - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141
> (find_package):
> > - Could not find a package configuration file provided by
> "boost_python310"
> > - (requested version 1.77.0) with any of the following names:
> > -
> > - boost_python310Config.cmake
> > - boost_python310-config.cmake
> > -
> > - Add the installation prefix of "boost_python310" to
> CMAKE_PREFIX_PATH or
> > - set "boost_python310_DIR" to a directory containing one of the
> above files.
> > - If "boost_python310" provides a separate development package or
> SDK, be
> > - sure it has been installed.
> > - Call Stack (most recent call first):
> > - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258
> (boost_find_component)
> > - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
> > - CMakeLists.txt:18 (find_package)
> > -
> > -Upstream-Status: Submitted [
> https://github.com/boostorg/boost_install/pull/53]
> > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ----
> > - tools/boost_install/BoostConfig.cmake | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/tools/boost_install/BoostConfig.cmake
> b/tools/boost_install/BoostConfig.cmake
> > -index fd17821..5dffa58 100644
> > ---- a/tools/boost_install/BoostConfig.cmake
> > -+++ b/tools/boost_install/BoostConfig.cmake
> > -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
> > - set(_BOOST_REQUIRED REQUIRED)
> > - endif()
> > -
> > -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
> > -+ if("${comp}" MATCHES
> "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
> > -
> > - # handle pythonXY and numpyXY versioned components for
> compatibility
> > -
> > diff --git
> a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> > index 91ab53efd9..67d5dff125 100644
> > ---
> a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> > +++
> b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
> > @@ -1,4 +1,4 @@
> > -From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001
> > +From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Tue, 18 Dec 2018 15:42:57 +0100
> > Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
> > @@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <
> chris_larson@mentor.com>
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >
> > ---
> > - tools/build/src/tools/gcc.jam | 139 ----------------------------------
> > - 1 file changed, 139 deletions(-)
> > + tools/build/src/tools/gcc.jam | 144 ----------------------------------
> > + 1 file changed, 144 deletions(-)
> >
> > diff --git a/tools/build/src/tools/gcc.jam
> b/tools/build/src/tools/gcc.jam
> > -index ff3209f7b..70cbc39a5 100644
> > +index 47a113223..d77525724 100644
> > --- a/tools/build/src/tools/gcc.jam
> > +++ b/tools/build/src/tools/gcc.jam
> > -@@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable :
> architecture : instruction-set + :
> > +@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable :
> architecture : instruction-set + :
> >
> <architecture>$(architecture)/<instruction-set>$(instruction-set)
> > : $(values) ;
> > }
> > @@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644
> > -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
> > -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
> > -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
> > +-# ARM
> > +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9
> -mfpu=vfpv3 -mfloat-abi=hard ;
> > +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
> > +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
> > +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5
> -mfpu=vfpv3-d16 -mfloat-abi=hard ;
> > -# AIX variant of RS/6000 & PowerPC
> > -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
> > diff --git
> a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> > deleted file mode 100644
> > index 523568e9bc..0000000000
> > ---
> a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
> > +++ /dev/null
> > @@ -1,54 +0,0 @@
> > -From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Fri, 16 Oct 2020 11:13:22 -0700
> > -Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist
> > -
> > -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
> > -they only have 64bit variant of time_t. Glibc defines SYS_futex
> interface based on
> > -__NR_futex, since this is used in applications, such applications start
> > -to fail to build for these newer architectures. This patch defines a
> > -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
> > -working
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - boost/fiber/detail/futex.hpp | 5 +++++
> > - libs/log/src/event.cpp | 4 ++++
> > - 2 files changed, 9 insertions(+)
> > -
> > -diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
> > -index e64bd5990..16bee64f1 100644
> > ---- a/boost/fiber/detail/futex.hpp
> > -+++ b/boost/fiber/detail/futex.hpp
> > -@@ -17,6 +17,11 @@ extern "C" {
> > - #include <linux/futex.h>
> > - #include <sys/syscall.h>
> > - }
> > -+
> > -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
> > -+#define SYS_futex SYS_futex_time64
> > -+#endif
> > -+
> > - #elif BOOST_OS_WINDOWS
> > - #include <windows.h>
> > - #endif
> > -diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
> > -index 5485154d7..2c7c0381f 100644
> > ---- a/libs/log/src/event.cpp
> > -+++ b/libs/log/src/event.cpp
> > -@@ -31,6 +31,10 @@
> > - #include <linux/futex.h>
> > - #include <boost/memory_order.hpp>
> > -
> > -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
> > -+#define SYS_futex SYS_futex_time64
> > -+#endif
> > -+
> > - // Some Android NDKs (Google NDK and older Crystax.NET NDK versions)
> don't define SYS_futex
> > - #if defined(SYS_futex)
> > - #define BOOST_LOG_SYS_FUTEX SYS_futex
> > ---
> > -2.28.0
> > -
> > diff --git
> a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> b/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> > deleted file mode 100644
> > index b05b795084..0000000000
> > ---
> a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> > +++ /dev/null
> > @@ -1,53 +0,0 @@
> > -From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001
> > -From: jzmaddock <john@johnmaddock.co.uk>
> > -Date: Wed, 1 Sep 2021 18:54:54 +0100
> > -Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the
> command
> > - line. Allows us to test/emulate platforms with no atomic integers.
> > -
> > -[buildroot@heine.tech:
> > - - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc
> > - - alter path to match boost release
> > -]
> > -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
> > ----
> > -Upstream-Status: Backport [
> https://github.com/boostorg/math/pull/684/commits/32bd6197353f6ea8e5bef01f09e25c944141acfc
> ]
> > - boost/math/tools/atomic.hpp | 10 +++++-----
> > - 1 file changed, 5 insertions(+), 5 deletions(-)
> > -
> > -diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp
> > -index cc76ed269f..e3cbf5db89 100644
> > ---- a/boost/math/tools/atomic.hpp
> > -+++ b/boost/math/tools/atomic.hpp
> > -@@ -16,27 +16,27 @@
> > - namespace boost {
> > - namespace math {
> > - namespace detail {
> > --#if ATOMIC_INT_LOCK_FREE == 2
> > -+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - typedef std::atomic<int> atomic_counter_type;
> > - typedef std::atomic<unsigned> atomic_unsigned_type;
> > - typedef int atomic_integer_type;
> > - typedef unsigned atomic_unsigned_integer_type;
> > --#elif ATOMIC_SHORT_LOCK_FREE == 2
> > -+#elif (ATOMIC_SHORT_LOCK_FREE == 2) &&
> !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - typedef std::atomic<short> atomic_counter_type;
> > - typedef std::atomic<unsigned short> atomic_unsigned_type;
> > - typedef short atomic_integer_type;
> > - typedef unsigned short atomic_unsigned_type;
> > --#elif ATOMIC_LONG_LOCK_FREE == 2
> > -+#elif (ATOMIC_LONG_LOCK_FREE == 2) &&
> !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - typedef std::atomic<long> atomic_unsigned_integer_type;
> > - typedef std::atomic<unsigned long> atomic_unsigned_type;
> > - typedef unsigned long atomic_unsigned_type;
> > - typedef long atomic_integer_type;
> > --#elif ATOMIC_LLONG_LOCK_FREE == 2
> > -+#elif (ATOMIC_LLONG_LOCK_FREE == 2) &&
> !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - typedef std::atomic<long long> atomic_unsigned_integer_type;
> > - typedef std::atomic<unsigned long long> atomic_unsigned_type;
> > - typedef long long atomic_integer_type;
> > - typedef unsigned long long atomic_unsigned_integer_type;
> > --#else
> > -+#elif !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - # define BOOST_MATH_NO_ATOMIC_INT
> > - #endif
> > - } // Namespace detail
> > diff --git
> a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> b/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> > deleted file mode 100644
> > index f69e4f21f3..0000000000
> > ---
> a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> > +++ /dev/null
> > @@ -1,151 +0,0 @@
> > -From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001
> > -From: jzmaddock <john@johnmaddock.co.uk>
> > -Date: Wed, 1 Sep 2021 20:31:53 +0100
> > -Subject: [PATCH] Make no atomics a soft failure in
> bernoulli_details.hpp.
> > - Include an "escape macro" so thread safety can be disabled if certain
> > - bernoulli features are to be used in a no-atomics environment. Fixes
> > - https://github.com/boostorg/math/issues/673.
> > -
> > -[buildroot@heine.tech:
> > - - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b
> > - - alter path to match boost release
> > -]
> > -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
> > ----
> > -Upstream-Status: Backport [
> https://github.com/boostorg/math/pull/684/commits/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b
> ]
> > - .../detail/bernoulli_details.hpp | 10 +++++++---
> > - libs/math/test/Jamfile.v2 | 3 +++
> > - test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++
> > - test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++
> > - test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++
> > - 5 files changed, 55 insertions(+), 3 deletions(-)
> > - create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp
> > - create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp
> > - create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp
> > -
> > -diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp
> b/boost/math/special_functions/detail/bernoulli_details.hpp
> > -index cf35545264..8519b7c89c 100644
> > ---- a/boost/math/special_functions/detail/bernoulli_details.hpp
> > -+++ b/boost/math/special_functions/detail/bernoulli_details.hpp
> > -@@ -360,7 +360,7 @@ class bernoulli_numbers_cache
> > - return out;
> > - }
> > -
> > -- #ifndef BOOST_HAS_THREADS
> > -+ #if !defined(BOOST_HAS_THREADS) ||
> defined(BOOST_MATH_BERNOULLI_UNTHREADED)
> > - //
> > - // Single threaded code, very simple:
> > - //
> > -@@ -382,6 +382,8 @@ class bernoulli_numbers_cache
> > - *out = (i >= m_overflow_limit) ?
> policies::raise_overflow_error<T>("boost::math::bernoulli_b2n<%1%>(std::size_t)",
> 0, T(i), pol) : bn[i];
> > - ++out;
> > - }
> > -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
> > -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your
> platform appears to have no atomic integers. If you are happy with
> thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to
> suppress this error.");
> > - #else
> > - //
> > - // Double-checked locking pattern, lets us access cached already
> cached values
> > -@@ -464,7 +466,7 @@ class bernoulli_numbers_cache
> > - return out;
> > - }
> > -
> > -- #ifndef BOOST_HAS_THREADS
> > -+ #if !defined(BOOST_HAS_THREADS) ||
> defined(BOOST_MATH_BERNOULLI_UNTHREADED)
> > - //
> > - // Single threaded code, very simple:
> > - //
> > -@@ -494,6 +496,8 @@ class bernoulli_numbers_cache
> > - }
> > - ++out;
> > - }
> > -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
> > -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your
> platform appears to have no atomic integers. If you are happy with
> thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to
> suppress this error.");
> > - #else
> > - //
> > - // Double-checked locking pattern, lets us access cached already
> cached values
> > -@@ -555,7 +559,7 @@ class bernoulli_numbers_cache
> > - // The value at which we know overflow has already occurred for the
> Bn:
> > - std::size_t m_overflow_limit;
> > -
> > -- #ifdef BOOST_HAS_THREADS
> > -+ #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT)
> > - std::mutex m_mutex;
> > - atomic_counter_type m_counter, m_current_precision;
> > - #else
> > -diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2
> > -index 52fb87f5e5..3ac63f9279 100644
> > ---- a/libs/math/test/Jamfile.v2
> > -+++ b/libs/math/test/Jamfile.v2
> > -@@ -1137,6 +1137,9 @@ test-suite misc :
> > -
> > - # [ run __temporary_test.cpp test_instances//test_instances : : :
> <test-info>always_show_run_output <pch>off ]
> > - [ compile test_no_long_double_policy.cpp ]
> > -+ [ compile compile_test/bernoulli_no_atomic_d.cpp ]
> > -+ [ compile compile_test/bernoulli_no_atomic_mp.cpp ]
> > -+ [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ]
> > - ;
> > -
> > - test-suite interpolators :
> > -diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp
> b/test/compile_test/bernoulli_no_atomic_d.cpp
> > -new file mode 100644
> > -index 0000000000..61926f7e1f
> > ---- /dev/null
> > -+++ b/test/compile_test/bernoulli_no_atomic_d.cpp
> > -@@ -0,0 +1,14 @@
> > -+// (C) Copyright John Maddock 2021.
> > -+// Use, modification and distribution are subject to the
> > -+// Boost Software License, Version 1.0. (See accompanying file
> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> > -+
> > -+#define BOOST_MATH_NO_ATOMIC_INT
> > -+
> > -+#include <boost/math/special_functions/bernoulli.hpp>
> > -+#include "test_compile_result.hpp"
> > -+
> > -+void compile_and_link_test()
> > -+{
> > -+ check_result<double>(boost::math::bernoulli_b2n<double>(4));
> > -+}
> > -diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp
> b/test/compile_test/bernoulli_no_atomic_fail.cpp
> > -new file mode 100644
> > -index 0000000000..bbd7152412
> > ---- /dev/null
> > -+++ b/test/compile_test/bernoulli_no_atomic_fail.cpp
> > -@@ -0,0 +1,15 @@
> > -+// (C) Copyright John Maddock 2021.
> > -+// Use, modification and distribution are subject to the
> > -+// Boost Software License, Version 1.0. (See accompanying file
> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> > -+
> > -+#define BOOST_MATH_NO_ATOMIC_INT
> > -+
> > -+#include <boost/math/special_functions/bernoulli.hpp>
> > -+#include <boost/multiprecision/cpp_bin_float.hpp>
> > -+#include "test_compile_result.hpp"
> > -+
> > -+void compile_and_link_test()
> > -+{
> > -+
> check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
> > -+}
> > -diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp
> b/test/compile_test/bernoulli_no_atomic_mp.cpp
> > -new file mode 100644
> > -index 0000000000..8d5a6e78e6
> > ---- /dev/null
> > -+++ b/test/compile_test/bernoulli_no_atomic_mp.cpp
> > -@@ -0,0 +1,16 @@
> > -+// (C) Copyright John Maddock 2021.
> > -+// Use, modification and distribution are subject to the
> > -+// Boost Software License, Version 1.0. (See accompanying file
> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
> > -+
> > -+#define BOOST_MATH_NO_ATOMIC_INT
> > -+#define BOOST_MATH_BERNOULLI_UNTHREADED
> > -+
> > -+#include <boost/math/special_functions/bernoulli.hpp>
> > -+#include <boost/multiprecision/cpp_bin_float.hpp>
> > -+#include "test_compile_result.hpp"
> > -+
> > -+void compile_and_link_test()
> > -+{
> > -+
> check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
> > -+}
> > diff --git
> a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> > new file mode 100644
> > index 0000000000..867ec03ba6
> > --- /dev/null
> > +++
> b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
> > @@ -0,0 +1,30 @@
> > +From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001
> > +From: Leonardo Neumann <leonardo@neumann.dev.br>
> > +Date: Mon, 13 Dec 2021 01:07:20 -0300
> > +Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
> > +
> > +Boost 1.78.0 fails to build on musl-based systems because musl does
> > +not include sys/stat.h by default.
> > +
> > +Fixes #161 ("Boost compiler error")
> > +Upstream-Status: Submitted [
> https://github.com/boostorg/interprocess/pull/162]
> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +---
> > + include/boost/interprocess/permissions.hpp | 4 ++++
> > + 1 file changed, 4 insertions(+)
> > +
> > +diff --git a/boost/interprocess/permissions.hpp
> b/boost/interprocess/permissions.hpp
> > +index ab55411e..0b21a685 100644
> > +--- a/boost/interprocess/permissions.hpp
> > ++++ b/boost/interprocess/permissions.hpp
> > +@@ -29,6 +29,10 @@
> > +
> > + #include <boost/interprocess/detail/win32_api.hpp>
> > +
> > ++#else
> > ++
> > ++#include <sys/stat.h>
> > ++
> > + #endif
> > +
> > + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
> > diff --git a/meta/recipes-support/boost/boost_1.77.0.bb
> b/meta/recipes-support/boost/boost_1.77.0.bb
> > deleted file mode 100644
> > index bde6b14a79..0000000000
> > --- a/meta/recipes-support/boost/boost_1.77.0.bb
> > +++ /dev/null
> > @@ -1,12 +0,0 @@
> > -require boost-${PV}.inc
> > -require boost.inc
> > -
> > -SRC_URI += "file://boost-CVE-2012-2677.patch \
> > - file://boost-math-disable-pch-for-gcc.patch \
> > -
> file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
> > - file://0001-dont-setup-compiler-flags-m32-m64.patch \
> > -
> file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
> > -
> file://0001-BoostConfig.cmake-allow-searching-for-python310.patch \
> > -
> file://0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
> \
> > -
> file://0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
> \
> > - "
> > diff --git a/meta/recipes-support/boost/boost_1.78.0.bb
> b/meta/recipes-support/boost/boost_1.78.0.bb
> > new file mode 100644
> > index 0000000000..f4b6ed8576
> > --- /dev/null
> > +++ b/meta/recipes-support/boost/boost_1.78.0.bb
> > @@ -0,0 +1,9 @@
> > +require boost-${PV}.inc
> > +require boost.inc
> > +
> > +SRC_URI += "file://boost-CVE-2012-2677.patch \
> > + file://boost-math-disable-pch-for-gcc.patch \
> > +
> file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
> > + file://0001-dont-setup-compiler-flags-m32-m64.patch \
> > + file://de657e01635306085488290ea83de541ec393f8b.patch \
> > + "
> > --
> > 2.20.1
> >
>
[-- Attachment #2: Type: text/html, Size: 32626 bytes --]
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH 18/26] boost: update 1.77.0 -> 1.78.0
2021-12-16 8:28 ` Alexander Kanavin
@ 2021-12-16 17:07 ` Khem Raj
0 siblings, 0 replies; 32+ messages in thread
From: Khem Raj @ 2021-12-16 17:07 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Martin Jansa, Michael Nosthoff
On Thu, Dec 16, 2021 at 12:29 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Thu, 16 Dec 2021 at 00:28, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> > Drop 0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch as
>> > it is difficult to rebase and needs to land upstream first.
>>
>> It's not that rebasing is too hard for this patch but this patch is an
>> incorrect way to fix what it's trying to solve and that's why I am
>> fine with dropping it.
>> landing upstream is not a precondition for submitting patches to
>> OpenEmbedded but good to have. All distributions carry patches and as
>> long as patches are working
>> their way upstream asynchronously its ok. Let's not make it too hard
>> for contributors and chase them away.
>
>
> Yes, rather than 'land upstream' I should've said 'submitted upstream' - that patch is dated 16 October 2020, and it never happened. While myself and everyone else enormously appreciate your toolchain and target work, there's a problem with amassing invasive pending patches related to that: no one except you truly understands them. So what I'm asking is just a bit more rigor going forward: submit patches upstream at the same time you submit them to core, and steadily work your way towards reducing the pile that's already there.
>
you are preaching to the choir :) However new patches will be required
as the packages are upgraded/updates, lot of upstream
do not support/test architectures that OE supports ( which is one of
USPs of OE ) so its bound to happen that something will regress for OE
and we have to patch it.
and we do not have developer strength like other distributions. By not
being accepting of this situation, we are effectively making it hard
for OE to be used on such architectures
which are either new or specific and they could be the reason for OE
to thrive in the future. There is a fine line to tread here.
> Alex
>
>
>>
>>
>> >
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> > .../{boost-1.77.0.inc => boost-1.78.0.inc} | 2 +-
>> > ....cmake-allow-searching-for-python310.patch | 50 ------
>> > ...h-instruction-set-flags-we-do-that-o.patch | 15 +-
>> > ...efine-SYS_futex-if-it-does-not-exist.patch | 54 -------
>> > ...th_no_atomic_int-on-the-command-line.patch | 53 ------
>> > ...oft-failure-in-bernoulli_details_hpp.patch | 151 ------------------
>> > ...7e01635306085488290ea83de541ec393f8b.patch | 30 ++++
>> > meta/recipes-support/boost/boost_1.77.0.bb | 12 --
>> > meta/recipes-support/boost/boost_1.78.0.bb | 9 ++
>> > 9 files changed, 50 insertions(+), 326 deletions(-)
>> > rename meta/recipes-support/boost/{boost-1.77.0.inc => boost-1.78.0.inc} (90%)
>> > delete mode 100644 meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
>> > delete mode 100644 meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
>> > delete mode 100644 meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
>> > delete mode 100644 meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
>> > create mode 100644 meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
>> > delete mode 100644 meta/recipes-support/boost/boost_1.77.0.bb
>> > create mode 100644 meta/recipes-support/boost/boost_1.78.0.bb
>> >
>> > diff --git a/meta/recipes-support/boost/boost-1.77.0.inc b/meta/recipes-support/boost/boost-1.78.0.inc
>> > similarity index 90%
>> > rename from meta/recipes-support/boost/boost-1.77.0.inc
>> > rename to meta/recipes-support/boost/boost-1.78.0.inc
>> > index 6df06e76c7..729a47b54f 100644
>> > --- a/meta/recipes-support/boost/boost-1.77.0.inc
>> > +++ b/meta/recipes-support/boost/boost-1.78.0.inc
>> > @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
>> > BOOST_P = "boost_${BOOST_VER}"
>> >
>> > SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
>> > -SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
>> > +SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"
>> >
>> > UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
>> > UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
>> > diff --git a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch b/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
>> > deleted file mode 100644
>> > index 0a9ee2cc95..0000000000
>> > --- a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch
>> > +++ /dev/null
>> > @@ -1,50 +0,0 @@
>> > -From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001
>> > -From: Martin Jansa <Martin.Jansa@gmail.com>
>> > -Date: Tue, 19 Oct 2021 12:24:31 +0000
>> > -Subject: [PATCH] BoostConfig.cmake: allow searching for python310
>> > -
>> > -* accept double digits in Python3_VERSION_MINOR
>> > -
>> > -* if someone is using e.g.:
>> > - find_package(Python3 REQUIRED)
>> > - find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
>> > -
>> > - with python-3.10 then it currently fails with:
>> > -
>> > - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0")
>> > - -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter
>> > - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package):
>> > - Could not find a package configuration file provided by "boost_python310"
>> > - (requested version 1.77.0) with any of the following names:
>> > -
>> > - boost_python310Config.cmake
>> > - boost_python310-config.cmake
>> > -
>> > - Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or
>> > - set "boost_python310_DIR" to a directory containing one of the above files.
>> > - If "boost_python310" provides a separate development package or SDK, be
>> > - sure it has been installed.
>> > - Call Stack (most recent call first):
>> > - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component)
>> > - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
>> > - CMakeLists.txt:18 (find_package)
>> > -
>> > -Upstream-Status: Submitted [https://github.com/boostorg/boost_install/pull/53]
>> > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> > ----
>> > - tools/boost_install/BoostConfig.cmake | 2 +-
>> > - 1 file changed, 1 insertion(+), 1 deletion(-)
>> > -
>> > -diff --git a/tools/boost_install/BoostConfig.cmake b/tools/boost_install/BoostConfig.cmake
>> > -index fd17821..5dffa58 100644
>> > ---- a/tools/boost_install/BoostConfig.cmake
>> > -+++ b/tools/boost_install/BoostConfig.cmake
>> > -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
>> > - set(_BOOST_REQUIRED REQUIRED)
>> > - endif()
>> > -
>> > -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
>> > -+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
>> > -
>> > - # handle pythonXY and numpyXY versioned components for compatibility
>> > -
>> > diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
>> > index 91ab53efd9..67d5dff125 100644
>> > --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
>> > +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
>> > @@ -1,4 +1,4 @@
>> > -From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001
>> > +From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001
>> > From: Alexander Kanavin <alex.kanavin@gmail.com>
>> > Date: Tue, 18 Dec 2018 15:42:57 +0100
>> > Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
>> > @@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> >
>> > ---
>> > - tools/build/src/tools/gcc.jam | 139 ----------------------------------
>> > - 1 file changed, 139 deletions(-)
>> > + tools/build/src/tools/gcc.jam | 144 ----------------------------------
>> > + 1 file changed, 144 deletions(-)
>> >
>> > diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
>> > -index ff3209f7b..70cbc39a5 100644
>> > +index 47a113223..d77525724 100644
>> > --- a/tools/build/src/tools/gcc.jam
>> > +++ b/tools/build/src/tools/gcc.jam
>> > -@@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
>> > +@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
>> > <architecture>$(architecture)/<instruction-set>$(instruction-set)
>> > : $(values) ;
>> > }
>> > @@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644
>> > -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
>> > -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
>> > -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
>> > +-# ARM
>> > +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
>> > +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
>> > +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
>> > +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
>> > -# AIX variant of RS/6000 & PowerPC
>> > -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
>> > diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
>> > deleted file mode 100644
>> > index 523568e9bc..0000000000
>> > --- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch
>> > +++ /dev/null
>> > @@ -1,54 +0,0 @@
>> > -From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001
>> > -From: Khem Raj <raj.khem@gmail.com>
>> > -Date: Fri, 16 Oct 2020 11:13:22 -0700
>> > -Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist
>> > -
>> > -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
>> > -they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on
>> > -__NR_futex, since this is used in applications, such applications start
>> > -to fail to build for these newer architectures. This patch defines a
>> > -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
>> > -working
>> > -
>> > -Upstream-Status: Pending
>> > -
>> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ----
>> > - boost/fiber/detail/futex.hpp | 5 +++++
>> > - libs/log/src/event.cpp | 4 ++++
>> > - 2 files changed, 9 insertions(+)
>> > -
>> > -diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
>> > -index e64bd5990..16bee64f1 100644
>> > ---- a/boost/fiber/detail/futex.hpp
>> > -+++ b/boost/fiber/detail/futex.hpp
>> > -@@ -17,6 +17,11 @@ extern "C" {
>> > - #include <linux/futex.h>
>> > - #include <sys/syscall.h>
>> > - }
>> > -+
>> > -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
>> > -+#define SYS_futex SYS_futex_time64
>> > -+#endif
>> > -+
>> > - #elif BOOST_OS_WINDOWS
>> > - #include <windows.h>
>> > - #endif
>> > -diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
>> > -index 5485154d7..2c7c0381f 100644
>> > ---- a/libs/log/src/event.cpp
>> > -+++ b/libs/log/src/event.cpp
>> > -@@ -31,6 +31,10 @@
>> > - #include <linux/futex.h>
>> > - #include <boost/memory_order.hpp>
>> > -
>> > -+#if !defined(SYS_futex) && defined(SYS_futex_time64)
>> > -+#define SYS_futex SYS_futex_time64
>> > -+#endif
>> > -+
>> > - // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex
>> > - #if defined(SYS_futex)
>> > - #define BOOST_LOG_SYS_FUTEX SYS_futex
>> > ---
>> > -2.28.0
>> > -
>> > diff --git a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch b/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
>> > deleted file mode 100644
>> > index b05b795084..0000000000
>> > --- a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch
>> > +++ /dev/null
>> > @@ -1,53 +0,0 @@
>> > -From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001
>> > -From: jzmaddock <john@johnmaddock.co.uk>
>> > -Date: Wed, 1 Sep 2021 18:54:54 +0100
>> > -Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command
>> > - line. Allows us to test/emulate platforms with no atomic integers.
>> > -
>> > -[buildroot@heine.tech:
>> > - - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc
>> > - - alter path to match boost release
>> > -]
>> > -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
>> > ----
>> > -Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/32bd6197353f6ea8e5bef01f09e25c944141acfc]
>> > - boost/math/tools/atomic.hpp | 10 +++++-----
>> > - 1 file changed, 5 insertions(+), 5 deletions(-)
>> > -
>> > -diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp
>> > -index cc76ed269f..e3cbf5db89 100644
>> > ---- a/boost/math/tools/atomic.hpp
>> > -+++ b/boost/math/tools/atomic.hpp
>> > -@@ -16,27 +16,27 @@
>> > - namespace boost {
>> > - namespace math {
>> > - namespace detail {
>> > --#if ATOMIC_INT_LOCK_FREE == 2
>> > -+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - typedef std::atomic<int> atomic_counter_type;
>> > - typedef std::atomic<unsigned> atomic_unsigned_type;
>> > - typedef int atomic_integer_type;
>> > - typedef unsigned atomic_unsigned_integer_type;
>> > --#elif ATOMIC_SHORT_LOCK_FREE == 2
>> > -+#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - typedef std::atomic<short> atomic_counter_type;
>> > - typedef std::atomic<unsigned short> atomic_unsigned_type;
>> > - typedef short atomic_integer_type;
>> > - typedef unsigned short atomic_unsigned_type;
>> > --#elif ATOMIC_LONG_LOCK_FREE == 2
>> > -+#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - typedef std::atomic<long> atomic_unsigned_integer_type;
>> > - typedef std::atomic<unsigned long> atomic_unsigned_type;
>> > - typedef unsigned long atomic_unsigned_type;
>> > - typedef long atomic_integer_type;
>> > --#elif ATOMIC_LLONG_LOCK_FREE == 2
>> > -+#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - typedef std::atomic<long long> atomic_unsigned_integer_type;
>> > - typedef std::atomic<unsigned long long> atomic_unsigned_type;
>> > - typedef long long atomic_integer_type;
>> > - typedef unsigned long long atomic_unsigned_integer_type;
>> > --#else
>> > -+#elif !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - # define BOOST_MATH_NO_ATOMIC_INT
>> > - #endif
>> > - } // Namespace detail
>> > diff --git a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch b/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
>> > deleted file mode 100644
>> > index f69e4f21f3..0000000000
>> > --- a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch
>> > +++ /dev/null
>> > @@ -1,151 +0,0 @@
>> > -From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001
>> > -From: jzmaddock <john@johnmaddock.co.uk>
>> > -Date: Wed, 1 Sep 2021 20:31:53 +0100
>> > -Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp.
>> > - Include an "escape macro" so thread safety can be disabled if certain
>> > - bernoulli features are to be used in a no-atomics environment. Fixes
>> > - https://github.com/boostorg/math/issues/673.
>> > -
>> > -[buildroot@heine.tech:
>> > - - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b
>> > - - alter path to match boost release
>> > -]
>> > -Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
>> > ----
>> > -Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b]
>> > - .../detail/bernoulli_details.hpp | 10 +++++++---
>> > - libs/math/test/Jamfile.v2 | 3 +++
>> > - test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++
>> > - test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++
>> > - test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++
>> > - 5 files changed, 55 insertions(+), 3 deletions(-)
>> > - create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp
>> > - create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp
>> > - create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp
>> > -
>> > -diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp b/boost/math/special_functions/detail/bernoulli_details.hpp
>> > -index cf35545264..8519b7c89c 100644
>> > ---- a/boost/math/special_functions/detail/bernoulli_details.hpp
>> > -+++ b/boost/math/special_functions/detail/bernoulli_details.hpp
>> > -@@ -360,7 +360,7 @@ class bernoulli_numbers_cache
>> > - return out;
>> > - }
>> > -
>> > -- #ifndef BOOST_HAS_THREADS
>> > -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
>> > - //
>> > - // Single threaded code, very simple:
>> > - //
>> > -@@ -382,6 +382,8 @@ class bernoulli_numbers_cache
>> > - *out = (i >= m_overflow_limit) ? policies::raise_overflow_error<T>("boost::math::bernoulli_b2n<%1%>(std::size_t)", 0, T(i), pol) : bn[i];
>> > - ++out;
>> > - }
>> > -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
>> > -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
>> > - #else
>> > - //
>> > - // Double-checked locking pattern, lets us access cached already cached values
>> > -@@ -464,7 +466,7 @@ class bernoulli_numbers_cache
>> > - return out;
>> > - }
>> > -
>> > -- #ifndef BOOST_HAS_THREADS
>> > -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED)
>> > - //
>> > - // Single threaded code, very simple:
>> > - //
>> > -@@ -494,6 +496,8 @@ class bernoulli_numbers_cache
>> > - }
>> > - ++out;
>> > - }
>> > -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT)
>> > -+ static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
>> > - #else
>> > - //
>> > - // Double-checked locking pattern, lets us access cached already cached values
>> > -@@ -555,7 +559,7 @@ class bernoulli_numbers_cache
>> > - // The value at which we know overflow has already occurred for the Bn:
>> > - std::size_t m_overflow_limit;
>> > -
>> > -- #ifdef BOOST_HAS_THREADS
>> > -+ #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT)
>> > - std::mutex m_mutex;
>> > - atomic_counter_type m_counter, m_current_precision;
>> > - #else
>> > -diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2
>> > -index 52fb87f5e5..3ac63f9279 100644
>> > ---- a/libs/math/test/Jamfile.v2
>> > -+++ b/libs/math/test/Jamfile.v2
>> > -@@ -1137,6 +1137,9 @@ test-suite misc :
>> > -
>> > - # [ run __temporary_test.cpp test_instances//test_instances : : : <test-info>always_show_run_output <pch>off ]
>> > - [ compile test_no_long_double_policy.cpp ]
>> > -+ [ compile compile_test/bernoulli_no_atomic_d.cpp ]
>> > -+ [ compile compile_test/bernoulli_no_atomic_mp.cpp ]
>> > -+ [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ]
>> > - ;
>> > -
>> > - test-suite interpolators :
>> > -diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp b/test/compile_test/bernoulli_no_atomic_d.cpp
>> > -new file mode 100644
>> > -index 0000000000..61926f7e1f
>> > ---- /dev/null
>> > -+++ b/test/compile_test/bernoulli_no_atomic_d.cpp
>> > -@@ -0,0 +1,14 @@
>> > -+// (C) Copyright John Maddock 2021.
>> > -+// Use, modification and distribution are subject to the
>> > -+// Boost Software License, Version 1.0. (See accompanying file
>> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
>> > -+
>> > -+#define BOOST_MATH_NO_ATOMIC_INT
>> > -+
>> > -+#include <boost/math/special_functions/bernoulli.hpp>
>> > -+#include "test_compile_result.hpp"
>> > -+
>> > -+void compile_and_link_test()
>> > -+{
>> > -+ check_result<double>(boost::math::bernoulli_b2n<double>(4));
>> > -+}
>> > -diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp b/test/compile_test/bernoulli_no_atomic_fail.cpp
>> > -new file mode 100644
>> > -index 0000000000..bbd7152412
>> > ---- /dev/null
>> > -+++ b/test/compile_test/bernoulli_no_atomic_fail.cpp
>> > -@@ -0,0 +1,15 @@
>> > -+// (C) Copyright John Maddock 2021.
>> > -+// Use, modification and distribution are subject to the
>> > -+// Boost Software License, Version 1.0. (See accompanying file
>> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
>> > -+
>> > -+#define BOOST_MATH_NO_ATOMIC_INT
>> > -+
>> > -+#include <boost/math/special_functions/bernoulli.hpp>
>> > -+#include <boost/multiprecision/cpp_bin_float.hpp>
>> > -+#include "test_compile_result.hpp"
>> > -+
>> > -+void compile_and_link_test()
>> > -+{
>> > -+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
>> > -+}
>> > -diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp b/test/compile_test/bernoulli_no_atomic_mp.cpp
>> > -new file mode 100644
>> > -index 0000000000..8d5a6e78e6
>> > ---- /dev/null
>> > -+++ b/test/compile_test/bernoulli_no_atomic_mp.cpp
>> > -@@ -0,0 +1,16 @@
>> > -+// (C) Copyright John Maddock 2021.
>> > -+// Use, modification and distribution are subject to the
>> > -+// Boost Software License, Version 1.0. (See accompanying file
>> > -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
>> > -+
>> > -+#define BOOST_MATH_NO_ATOMIC_INT
>> > -+#define BOOST_MATH_BERNOULLI_UNTHREADED
>> > -+
>> > -+#include <boost/math/special_functions/bernoulli.hpp>
>> > -+#include <boost/multiprecision/cpp_bin_float.hpp>
>> > -+#include "test_compile_result.hpp"
>> > -+
>> > -+void compile_and_link_test()
>> > -+{
>> > -+ check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4));
>> > -+}
>> > diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
>> > new file mode 100644
>> > index 0000000000..867ec03ba6
>> > --- /dev/null
>> > +++ b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch
>> > @@ -0,0 +1,30 @@
>> > +From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001
>> > +From: Leonardo Neumann <leonardo@neumann.dev.br>
>> > +Date: Mon, 13 Dec 2021 01:07:20 -0300
>> > +Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
>> > +
>> > +Boost 1.78.0 fails to build on musl-based systems because musl does
>> > +not include sys/stat.h by default.
>> > +
>> > +Fixes #161 ("Boost compiler error")
>> > +Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162]
>> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > +---
>> > + include/boost/interprocess/permissions.hpp | 4 ++++
>> > + 1 file changed, 4 insertions(+)
>> > +
>> > +diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp
>> > +index ab55411e..0b21a685 100644
>> > +--- a/boost/interprocess/permissions.hpp
>> > ++++ b/boost/interprocess/permissions.hpp
>> > +@@ -29,6 +29,10 @@
>> > +
>> > + #include <boost/interprocess/detail/win32_api.hpp>
>> > +
>> > ++#else
>> > ++
>> > ++#include <sys/stat.h>
>> > ++
>> > + #endif
>> > +
>> > + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
>> > diff --git a/meta/recipes-support/boost/boost_1.77.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb
>> > deleted file mode 100644
>> > index bde6b14a79..0000000000
>> > --- a/meta/recipes-support/boost/boost_1.77.0.bb
>> > +++ /dev/null
>> > @@ -1,12 +0,0 @@
>> > -require boost-${PV}.inc
>> > -require boost.inc
>> > -
>> > -SRC_URI += "file://boost-CVE-2012-2677.patch \
>> > - file://boost-math-disable-pch-for-gcc.patch \
>> > - file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
>> > - file://0001-dont-setup-compiler-flags-m32-m64.patch \
>> > - file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
>> > - file://0001-BoostConfig.cmake-allow-searching-for-python310.patch \
>> > - file://0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch \
>> > - file://0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch \
>> > - "
>> > diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb
>> > new file mode 100644
>> > index 0000000000..f4b6ed8576
>> > --- /dev/null
>> > +++ b/meta/recipes-support/boost/boost_1.78.0.bb
>> > @@ -0,0 +1,9 @@
>> > +require boost-${PV}.inc
>> > +require boost.inc
>> > +
>> > +SRC_URI += "file://boost-CVE-2012-2677.patch \
>> > + file://boost-math-disable-pch-for-gcc.patch \
>> > + file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
>> > + file://0001-dont-setup-compiler-flags-m32-m64.patch \
>> > + file://de657e01635306085488290ea83de541ec393f8b.patch \
>> > + "
>> > --
>> > 2.20.1
>> >
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 19/26] libptytty: add recipe
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (16 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 18/26] boost: update 1.77.0 -> 1.78.0 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 20/26] rxvt-unicode: upgrade 9.26 -> 9.30 Alexander Kanavin
` (6 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
It is a dependency of new rxvt-unicode.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/conf/distro/include/maintainers.inc | 1 +
...akeLists.txt-do-not-run-cross-binary.patch | 24 +++++++++++++++++++
meta/recipes-sato/libptytty/libptytty_2.0.bb | 13 ++++++++++
3 files changed, 38 insertions(+)
create mode 100644 meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch
create mode 100644 meta/recipes-sato/libptytty/libptytty_2.0.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 8e86ea45d2..4fe655fdcd 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -373,6 +373,7 @@ RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <alex.kanavin@gmail.com>"
+RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-libpsl = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-librepo = "Wang Mingyu <wangmy@fujitsu.com>"
RECIPE_MAINTAINER:pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch b/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch
new file mode 100644
index 0000000000..d3a458f100
--- /dev/null
+++ b/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch
@@ -0,0 +1,24 @@
+From 989ae1f3651686c1f1046fe1c1596d564c3f452d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Mon, 13 Dec 2021 14:33:01 +0100
+Subject: [PATCH] CMakeLists.txt: do not run cross-binary
+
+Upstream-Status: Inappropriate [issue reported at https://github.com/yusiwen/libptytty/issues/2]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1ad6c0..3bd4d97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -271,7 +271,7 @@ if(NOT HAVE_UNIX_FDPASS)
+ message(FATAL_ERROR "libptytty requires unix-compliant filehandle passing ability")
+ endif()
+
+-check_c_source_runs(
++check_c_source_compiles(
+ "
+ #include <grp.h>
+ #include <sys/stat.h>
diff --git a/meta/recipes-sato/libptytty/libptytty_2.0.bb b/meta/recipes-sato/libptytty/libptytty_2.0.bb
new file mode 100644
index 0000000000..85e3a36fba
--- /dev/null
+++ b/meta/recipes-sato/libptytty/libptytty_2.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = " OS independent and secure pty/tty and utmp/wtmp/lastlog handling"
+HOMEPAGE = "http://software.schmorp.de/pkg/libptytty.html"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+SRC_URI = "http://dist.schmorp.de/libptytty/libptytty-${PV}.tar.gz \
+ file://0001-CMakeLists.txt-do-not-run-cross-binary.patch \
+ "
+SRC_URI[sha256sum] = "8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7"
+
+inherit cmake
+
+EXTRA_OECMAKE:append:libc-musl = " -DWTMP_SUPPORT=OFF"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 20/26] rxvt-unicode: upgrade 9.26 -> 9.30
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (17 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 19/26] libptytty: add recipe Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 21/26] diffoscope: upgrade 194 -> 196 Alexander Kanavin
` (5 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 5 +----
.../{rxvt-unicode_9.26.bb => rxvt-unicode_9.30.bb} | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.26.bb => rxvt-unicode_9.30.bb} (71%)
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index 69b8a659ed..e7d520ebef 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \
output. It also supports mixing multiple fonts at the \
same time, including Xft fonts."
HOMEPAGE = "https://rxvt.org/"
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu"
+DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty"
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch \
@@ -22,7 +22,6 @@ ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
CFLAGS:append = " -fpermissive"
EXTRA_OECONF = "--enable-xim \
- --enable-utmp --enable-wtmp --enable-lastlog \
--with-term=rxvt --enable-keepscrolling \
--enable-xft --with-name=rxvt --enable-frills \
--enable-swapscreen --enable-transparency \
@@ -31,8 +30,6 @@ EXTRA_OECONF = "--enable-xim \
--enable-combining --disable-perl \
--with-x=${STAGING_DIR_HOST}${prefix}"
-EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog"
-
PACKAGECONFIG ??= ""
PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.30.bb
similarity index 71%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.30.bb
index 3fe69a543f..0133029e0a 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.30.bb
@@ -4,5 +4,5 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6"
-SRC_URI[sha256sum] = "643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b"
+SRC_URI[sha256sum] = "fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 21/26] diffoscope: upgrade 194 -> 196
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (18 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 20/26] rxvt-unicode: upgrade 9.26 -> 9.30 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1 Alexander Kanavin
` (4 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../diffoscope/{diffoscope_194.bb => diffoscope_196.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/diffoscope/{diffoscope_194.bb => diffoscope_196.bb} (92%)
diff --git a/meta/recipes-support/diffoscope/diffoscope_194.bb b/meta/recipes-support/diffoscope/diffoscope_196.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_194.bb
rename to meta/recipes-support/diffoscope/diffoscope_196.bb
index 51d86ff052..62a1561a0d 100644
--- a/meta/recipes-support/diffoscope/diffoscope_194.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_196.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
inherit pypi setuptools3
-SRC_URI[sha256sum] = "3d28f0325e00effc6c23c50f916d153524aa393623df2fd1fc8ae0f6a12daf94"
+SRC_URI[sha256sum] = "d31fd0d8ac58d41cc111ef6a3bb0007f5f52543b932bf93584bdd0dfe029e626"
RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (19 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 21/26] diffoscope: upgrade 194 -> 196 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-22 2:11 ` [OE-core] " Peter Kjellerstedt
[not found] ` <16C2F1D2002A5FB3.15364@lists.openembedded.org>
2021-12-15 22:40 ` [PATCH 23/26] libx11: update 1.7.3 -> 1.7.3.1 Alexander Kanavin
` (3 subsequent siblings)
24 siblings, 2 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)
diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
similarity index 73%
rename from meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
rename to meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
index 8e39ef025f..a92f9cb729 100644
--- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
+++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
@@ -11,17 +11,11 @@ LICENSE = "OFL-1.1 & Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
inherit gnomebase meson allarch fontcache pkgconfig
-SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
+SRC_URI[archive.sha256sum] = "f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411"
# remove at next version upgrade or when output changes
-PR = "r1"
HASHEQUIV_HASH_VERSION .= ".2"
EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
FILES:${PN} = "${datadir}/fonts ${datadir}/fontconfig"
-
-# This isn't a GNOME-style version do gnome_verdir fails. Just return the
-# version as that is how the directory is structured.
-def gnome_verdir(v):
- return v
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* RE: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
2021-12-15 22:40 ` [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1 Alexander Kanavin
@ 2021-12-22 2:11 ` Peter Kjellerstedt
[not found] ` <16C2F1D2002A5FB3.15364@lists.openembedded.org>
1 sibling, 0 replies; 32+ messages in thread
From: Peter Kjellerstedt @ 2021-12-22 2:11 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core; +Cc: Alexander Kanavin
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 15 december 2021 23:41
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> ...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
> rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)
>
> diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> similarity index 73%
> rename from meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> rename to meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> index 8e39ef025f..a92f9cb729 100644
> --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> @@ -11,17 +11,11 @@ LICENSE = "OFL-1.1 & Apache-2.0"
> LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
>
> inherit gnomebase meson allarch fontcache pkgconfig
> -SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
> +SRC_URI[archive.sha256sum] = "f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411"
>
> # remove at next version upgrade or when output changes
> -PR = "r1"
> HASHEQUIV_HASH_VERSION .= ".2"
Shouldn't all three lines above be removed now that the version changes?
>
> EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
>
> FILES:${PN} = "${datadir}/fonts ${datadir}/fontconfig"
> -
> -# This isn't a GNOME-style version do gnome_verdir fails. Just return the
> -# version as that is how the directory is structured.
> -def gnome_verdir(v):
> - return v
> --
> 2.20.1
//Peter
^ permalink raw reply [flat|nested] 32+ messages in thread[parent not found: <16C2F1D2002A5FB3.15364@lists.openembedded.org>]
* RE: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
[not found] ` <16C2F1D2002A5FB3.15364@lists.openembedded.org>
@ 2021-12-22 2:33 ` Peter Kjellerstedt
0 siblings, 0 replies; 32+ messages in thread
From: Peter Kjellerstedt @ 2021-12-22 2:33 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core; +Cc: Alexander Kanavin
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 22 december 2021 03:12
> To: Alexander Kanavin <alex.kanavin@gmail.com>; openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: Re: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
>
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> > Sent: den 15 december 2021 23:41
> > To: openembedded-core@lists.openembedded.org
> > Cc: Alexander Kanavin <alex@linutronix.de>
> > Subject: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> > ...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
> > 1 file changed, 1 insertion(+), 7 deletions(-)
> > rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)
> >
> > diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > similarity index 73%
> > rename from meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> > rename to meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > index 8e39ef025f..a92f9cb729 100644
> > --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> > +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > @@ -11,17 +11,11 @@ LICENSE = "OFL-1.1 & Apache-2.0"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
> >
> > inherit gnomebase meson allarch fontcache pkgconfig
> > -SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
> > +SRC_URI[archive.sha256sum] = "f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411"
> >
> > # remove at next version upgrade or when output changes
> > -PR = "r1"
> > HASHEQUIV_HASH_VERSION .= ".2"
>
> Shouldn't all three lines above be removed now that the version changes?
Never mind. I just saw that RP had fixed it before integrating the change.
> >
> > EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
> >
> > FILES:${PN} = "${datadir}/fonts ${datadir}/fontconfig"
> > -
> > -# This isn't a GNOME-style version do gnome_verdir fails. Just return the
> > -# version as that is how the directory is structured.
> > -def gnome_verdir(v):
> > - return v
> > --
> > 2.20.1
>
> //Peter
//Peter
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 23/26] libx11: update 1.7.3 -> 1.7.3.1
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (20 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 24/26] debianutils: update 4.11.2 -> 5.5 Alexander Kanavin
` (2 subsequent siblings)
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../xorg-lib/{libx11_1.7.3.bb => libx11_1.7.3.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/xorg-lib/{libx11_1.7.3.bb => libx11_1.7.3.1.bb} (94%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.7.3.bb b/meta/recipes-graphics/xorg-lib/libx11_1.7.3.1.bb
similarity index 94%
rename from meta/recipes-graphics/xorg-lib/libx11_1.7.3.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.7.3.1.bb
index f55252b924..be9b8df6ce 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.7.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.7.3.1.bb
@@ -16,7 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz"
SRC_URI += "file://disable_tests.patch \
"
-SRC_URI[sha256sum] = "dfd1343db3a0e523f1bb97d5ba71453c79eee78a77e51ca9f8dfef7131c6f0fe"
+SRC_URI[sha256sum] = "2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989"
PROVIDES = "virtual/libx11"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 24/26] debianutils: update 4.11.2 -> 5.5
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (21 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 23/26] libx11: update 1.7.3 -> 1.7.3.1 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 25/26] libsdl2: update 2.0.16 -> 2.0.18 Alexander Kanavin
2021-12-15 22:40 ` [PATCH 26/26] runqemu: additional setting to force software rendering with sdl 2.0.18 Alexander Kanavin
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...bianutils_4.11.2.bb => debianutils_5.5.bb} | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-support/debianutils/{debianutils_4.11.2.bb => debianutils_5.5.bb} (73%)
diff --git a/meta/recipes-support/debianutils/debianutils_4.11.2.bb b/meta/recipes-support/debianutils/debianutils_5.5.bb
similarity index 73%
rename from meta/recipes-support/debianutils/debianutils_4.11.2.bb
rename to meta/recipes-support/debianutils/debianutils_5.5.bb
index 231666c4dc..6eea86f6d3 100644
--- a/meta/recipes-support/debianutils/debianutils_4.11.2.bb
+++ b/meta/recipes-support/debianutils/debianutils_5.5.bb
@@ -8,25 +8,26 @@ SECTION = "base"
LICENSE = "GPLv2 & SMAIL_GPL"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94"
-SRC_URI = "http://snapshot.debian.org/archive/debian/20200929T025235Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz"
-# the package is taken from snapshots.debian.org; that source is static and goes stale
-# so we check the latest upstream from a directory that does get updated
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/"
+SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \
+ "
-SRC_URI[sha256sum] = "3b680e81709b740387335fac8f8806d71611dcf60874e1a792e862e48a1650de"
+SRCREV = "4c420893485ad07d771c327ef899819d4846408f"
inherit autotools update-alternatives
-S = "${WORKDIR}/debianutils"
+S = "${WORKDIR}/git"
+
+# Disable po4a (translated manpages) sub-directory, as that requires po4a to build
do_configure:prepend() {
- sed -i -e 's:tempfile.1 which.1:which.1:g' ${S}/Makefile.am
+ sed -i -e 's:po4a::g' ${S}/Makefile.am
}
+
do_install:append() {
if [ "${base_bindir}" != "${bindir}" ]; then
# Debian places some utils into ${base_bindir} as does busybox
install -d ${D}${base_bindir}
- for app in run-parts tempfile; do
+ for app in run-parts; do
mv ${D}${bindir}/$app ${D}${base_bindir}/$app
done
fi
@@ -41,7 +42,7 @@ RDEPENDS:${PN} += "${PN}-run-parts"
RDEPENDS:${PN}:class-native = ""
ALTERNATIVE_PRIORITY = "30"
-ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog tempfile which"
+ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which"
ALTERNATIVE_PRIORITY_${PN}-run-parts = "60"
ALTERNATIVE:${PN}-run-parts = "run-parts"
@@ -54,7 +55,6 @@ ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel"
ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell"
ALTERNATIVE_LINK_NAME[run-parts] = "${base_bindir}/run-parts"
ALTERNATIVE_LINK_NAME[savelog] = "${bindir}/savelog"
-ALTERNATIVE_LINK_NAME[tempfile] = "${base_bindir}/tempfile"
ALTERNATIVE_LINK_NAME[which] = "${bindir}/which"
BBCLASSEXTEND = "native"
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 25/26] libsdl2: update 2.0.16 -> 2.0.18
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (22 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 24/26] debianutils: update 4.11.2 -> 5.5 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
2021-12-15 22:40 ` [PATCH 26/26] runqemu: additional setting to force software rendering with sdl 2.0.18 Alexander Kanavin
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
sdl-dlopen option is no longer supported.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../libsdl2/{libsdl2_2.0.16.bb => libsdl2_2.0.18.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.16.bb => libsdl2_2.0.18.bb} (96%)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.16.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
similarity index 96%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.16.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
index bd7dea275e..5e645b443c 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.16.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
S = "${WORKDIR}/SDL2-${PV}"
-SRC_URI[sha256sum] = "65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b"
+SRC_URI[sha256sum] = "94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
inherit autotools lib_package binconfig-disabled pkgconfig
@@ -35,7 +35,6 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
--disable-video-dummy \
--disable-video-rpi \
--enable-pthreads \
- --enable-sdl-dlopen \
--disable-rpath \
--disable-sndio \
--disable-fcitx --disable-ibus \
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 26/26] runqemu: additional setting to force software rendering with sdl 2.0.18
2021-12-15 22:40 [PATCH 01/26] insane: add Inactive-Upstream to possible patch status list Alexander Kanavin
` (23 preceding siblings ...)
2021-12-15 22:40 ` [PATCH 25/26] libsdl2: update 2.0.16 -> 2.0.18 Alexander Kanavin
@ 2021-12-15 22:40 ` Alexander Kanavin
24 siblings, 0 replies; 32+ messages in thread
From: Alexander Kanavin @ 2021-12-15 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
scripts/runqemu | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/runqemu b/scripts/runqemu
index 410d2a9939..d49f128fe4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -474,6 +474,7 @@ class BaseConfig(object):
if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]:
os.environ['SDL_RENDER_DRIVER'] = 'software'
+ os.environ['SDL_FRAMEBUFFER_ACCELERATION'] = 'false'
unknown_arg = ""
for arg in sys.argv[1:]:
--
2.20.1
^ permalink raw reply related [flat|nested] 32+ messages in thread