* [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22
@ 2021-11-05 8:48 Alexander Kanavin
2021-11-05 8:48 ` [PATCH 2/7] perl: backport gdbm 1.2x compatibility fixes Alexander Kanavin
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Alexander Kanavin @ 2021-11-05 8:48 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-support/gdbm/files/ptest.patch | 18 +++++++++---------
.../gdbm/{gdbm_1.19.bb => gdbm_1.22.bb} | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
rename meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.22.bb} (90%)
diff --git a/meta/recipes-support/gdbm/files/ptest.patch b/meta/recipes-support/gdbm/files/ptest.patch
index 1e67dbd554..187f09655d 100644
--- a/meta/recipes-support/gdbm/files/ptest.patch
+++ b/meta/recipes-support/gdbm/files/ptest.patch
@@ -1,4 +1,4 @@
-From 41448708e163c8ec1f980464e7dd6741db427c8a Mon Sep 17 00:00:00 2001
+From 8bea84a598b51a7ac7e50aa8f0f20857a9b6b07b Mon Sep 17 00:00:00 2001
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Sun, 4 May 2014 16:02:07 +0200
Subject: [PATCH] Add install-ptest rules.
@@ -13,12 +13,12 @@ Upstream-Status: Pending
2 files changed, 16 insertions(+)
diff --git a/Makefile.am b/Makefile.am
-index ecc03df..9fbbda5 100644
+index 25e200d..03d5ef0 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -55,3 +55,8 @@ ChangeLog:
- awk -f $(top_srcdir)/git2chg.awk \
- -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \
+@@ -64,3 +64,8 @@ ChangeLog:
+ mv ChangeLog.tmp ChangeLog; \
+ rm -f ChangeLog.tmp; \
fi
+
+install-ptest:
@@ -26,12 +26,12 @@ index ecc03df..9fbbda5 100644
+ $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \
+ done
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index dbe17dd..06f537f 100644
+index 337cbed..92ec3be 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -169,3 +169,14 @@ EXTRA_DIST += \
- gdbmtool/base.exp\
- config/default.exp
+@@ -139,3 +139,14 @@ d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
+
+ SUBDIRS = gdbmtool
+buildtests: $(check_PROGRAMS) $(TESTSUITE)
+
diff --git a/meta/recipes-support/gdbm/gdbm_1.19.bb b/meta/recipes-support/gdbm/gdbm_1.22.bb
similarity index 90%
rename from meta/recipes-support/gdbm/gdbm_1.19.bb
rename to meta/recipes-support/gdbm/gdbm_1.22.bb
index 1d1a0c8dd1..5cb12cd57c 100644
--- a/meta/recipes-support/gdbm/gdbm_1.19.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.22.bb
@@ -13,8 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://ptest.patch \
"
-SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e"
-SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc"
+SRC_URI[sha256sum] = "f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762"
inherit autotools gettext texinfo lib_package ptest
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/7] perl: backport gdbm 1.2x compatibility fixes 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 2021-11-05 8:48 ` [PATCH 3/7] valgrind: mark ptest-specific patch as inappropriate Alexander Kanavin ` (4 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...e5fdd87aa205011512cd1e6cc655bcf677fd.patch | 31 ++++++++++++++ ...2398e766500cb5d83c4d76b642fcf31d997a.patch | 40 +++++++++++++++++++ ...297a58b8f10ab885c19eec48ea076116cc1f.patch | 25 ++++++++++++ meta/recipes-devtools/perl/perl_5.34.0.bb | 3 ++ 4 files changed, 99 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch create mode 100644 meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch create mode 100644 meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch diff --git a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch new file mode 100644 index 0000000000..1cb65d932c --- /dev/null +++ b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch @@ -0,0 +1,31 @@ +From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 23 Jun 2021 15:31:42 +0300 +Subject: [PATCH] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/GDBM_File/GDBM_File.xs | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs +index 494c2889ca89..0125b5dcac4d 100644 +--- a/ext/GDBM_File/GDBM_File.xs ++++ b/ext/GDBM_File/GDBM_File.xs +@@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size) + #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") + #endif + +-#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 +-/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR +- if the requested key did not exist */ +-# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) ++#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 ++/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested ++ key did not exist. Other similar function wouls set GDBM_NO_ERROR instead. ++ The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */ ++# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) + #else + # define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) + #endif diff --git a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch new file mode 100644 index 0000000000..628903f41c --- /dev/null +++ b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch @@ -0,0 +1,40 @@ +From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 23 Jun 2021 10:26:50 +0300 +Subject: [PATCH] Fix GDBM_File to compile with version 1.20 and earlier + +* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally, +depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR. +Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since +gdbm commit d3e27957). + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/GDBM_File/GDBM_File.xs | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs +index cd0bb6f26ffa..494c2889ca89 100644 +--- a/ext/GDBM_File/GDBM_File.xs ++++ b/ext/GDBM_File/GDBM_File.xs +@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size) + #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") + #endif + +-#ifndef GDBM_ITEM_NOT_FOUND +-# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR +-#endif +- ++#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 + /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR + if the requested key did not exist */ +-#define ITEM_NOT_FOUND() \ +- (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR) ++# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) ++#else ++# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) ++#endif + + #define CHECKDB(db) do { \ + if (!db->dbp) { \ diff --git a/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch b/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch new file mode 100644 index 0000000000..3864f1a121 --- /dev/null +++ b/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch @@ -0,0 +1,25 @@ +From ea57297a58b8f10ab885c19eec48ea076116cc1f Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 23 Jun 2021 14:24:47 +0300 +Subject: [PATCH] Raise version number in ext/GDBM_File/GDBM_File.pm + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + ext/GDBM_File/GDBM_File.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm +index d837536f804c..cb08d091b829 100644 +--- a/ext/GDBM_File/GDBM_File.pm ++++ b/ext/GDBM_File/GDBM_File.pm +@@ -363,7 +363,7 @@ require XSLoader; + ); + + # This module isn't dual life, so no need for dev version numbers. +-$VERSION = '1.19'; ++$VERSION = '1.20'; + + XSLoader::load(); + diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index 89de558979..16d45ccff3 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -18,6 +18,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ file://CVE-2021-36770.patch \ + file://aacd2398e766500cb5d83c4d76b642fcf31d997a.patch \ + file://ea57297a58b8f10ab885c19eec48ea076116cc1f.patch \ + file://5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/7] valgrind: mark ptest-specific patch as inappropriate 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin 2021-11-05 8:48 ` [PATCH 2/7] perl: backport gdbm 1.2x compatibility fixes Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 2021-11-05 8:48 ` [PATCH 4/7] systemd-bootchart: submit musl patches upstream Alexander Kanavin ` (3 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin I do not think upstream is going to accept this; if you disagree please do the submission. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch index 0c399ef52c..a3637ea846 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch @@ -14,7 +14,7 @@ option, --yocto-ptest, the valgrind regression test output is unchanged. Enforce 30 seconds limit for the test. This resume execution of the remaining tests when valgrind hangs. -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/7] systemd-bootchart: submit musl patches upstream 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin 2021-11-05 8:48 ` [PATCH 2/7] perl: backport gdbm 1.2x compatibility fixes Alexander Kanavin 2021-11-05 8:48 ` [PATCH 3/7] valgrind: mark ptest-specific patch as inappropriate Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 2021-11-05 8:48 ` [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target Alexander Kanavin ` (2 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...1-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch | 2 +- .../systemd-bootchart/0002-musl-does-not-provide-printf-h.patch | 2 +- .../0003-musl-does-not-provide-canonicalize_file_name.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch index f392ceafcc..12eecc989b 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch @@ -12,8 +12,8 @@ systemd/0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch Based on work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending src/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch index 196272f7a2..8be3bed395 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch @@ -10,8 +10,8 @@ Original patch author: Emil Renner Berthing <systemd@esmil.dk> Includes work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending Makefile.am | 4 + configure.ac | 3 + diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch index 7670d95f07..c2c276e458 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch @@ -9,8 +9,8 @@ systemd/0007-check-for-missing-canonicalize_file_name.patch Based on work by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/47] --- -Upstream-Status: Pending src/path-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin ` (2 preceding siblings ...) 2021-11-05 8:48 ` [PATCH 4/7] systemd-bootchart: submit musl patches upstream Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 2021-11-05 17:22 ` [OE-core] " Khem Raj 2021-11-06 7:49 ` Khem Raj 2021-11-05 8:48 ` [PATCH 6/7] libxml2: mark patch as non-upstreamable Alexander Kanavin 2021-11-05 8:48 ` [PATCH 7/7] libpcre/libpcre2: correct SRC_URI Alexander Kanavin 5 siblings, 2 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Do not try to mangle the upstream list of targets; after discussion with upstream it turns out it's neither necessary nor upstreamable: https://github.com/crossbeam-rs/crossbeam/pull/751 Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...check-only-the-architecture-not-the-.patch | 143 ------------------ meta/recipes-gnome/librsvg/librsvg_2.52.3.bb | 4 +- 2 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch deleted file mode 100644 index 0c1cf59eff..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 70557b217644901daaf9d8ef793f5e84c937762e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 5 Oct 2021 23:41:59 +0200 -Subject: [PATCH] crossbeam-utils: check only the architecture, not the whole - target string - -There can be custom targets in use, and it's not possible to make a list -of them; for the check only the first item in the target string is actually -relevant (the architecture of the target). - -Upstream-Status: Pending [needs an upstream ticket and possibly a rework of list generator script] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - vendor/crossbeam-utils/.cargo-checksum.json | 4 +- - vendor/crossbeam-utils/build.rs | 8 ++- - vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++------------- - 3 files changed, 38 insertions(+), 52 deletions(-) - ---- a/vendor/crossbeam-utils/.cargo-checksum.json -+++ b/vendor/crossbeam-utils/.cargo-checksum.json -@@ -1 +1,3 @@ --{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d", -+"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354", -+"no_atomic.rs":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} ---- a/vendor/crossbeam-utils/build.rs -+++ b/vendor/crossbeam-utils/build.rs -@@ -20,17 +20,19 @@ fn main() { - } - }; - -+ let target_arch = target.split('-').next().unwrap_or_default(); -+ - // Note that this is `no_*`, not `has_*`. This allows treating - // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't - // run. This is needed for compatibility with non-cargo build systems that - // don't run the build script. -- if NO_ATOMIC_CAS.contains(&&*target) { -+ if NO_ATOMIC_CAS.contains(&&*target_arch) { - println!("cargo:rustc-cfg=crossbeam_no_atomic_cas"); - } -- if NO_ATOMIC.contains(&&*target) { -+ if NO_ATOMIC.contains(&&*target_arch) { - println!("cargo:rustc-cfg=crossbeam_no_atomic"); - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); -- } else if NO_ATOMIC_64.contains(&&*target) { -+ } else if NO_ATOMIC_64.contains(&&*target_arch) { - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); - } else { - // Otherwise, assuming `"max-atomic-width" == 64`. ---- a/vendor/crossbeam-utils/no_atomic.rs -+++ b/vendor/crossbeam-utils/no_atomic.rs -@@ -2,58 +2,41 @@ - // It is not intended for manual editing. - - const NO_ATOMIC_CAS: &[&str] = &[ -- "avr-unknown-gnu-atmega328", -- "msp430-none-elf", -- "riscv32i-unknown-none-elf", -- "riscv32imc-unknown-none-elf", -- "thumbv4t-none-eabi", -- "thumbv6m-none-eabi", -+ "avr", -+ "msp430", -+ "riscv32i", -+ "riscv32imc", -+ "thumbv4t", -+ "thumbv6m", - ]; - #[allow(dead_code)] - const NO_ATOMIC_64: &[&str] = &[ -- "arm-linux-androideabi", -- "armebv7r-none-eabi", -- "armebv7r-none-eabihf", -- "armv4t-unknown-linux-gnueabi", -- "armv5te-unknown-linux-gnueabi", -- "armv5te-unknown-linux-musleabi", -- "armv5te-unknown-linux-uclibceabi", -- "armv7r-none-eabi", -- "armv7r-none-eabihf", -- "hexagon-unknown-linux-musl", -- "mips-unknown-linux-gnu", -- "mips-unknown-linux-musl", -- "mips-unknown-linux-uclibc", -- "mipsel-unknown-linux-gnu", -- "mipsel-unknown-linux-musl", -- "mipsel-unknown-linux-uclibc", -- "mipsel-unknown-none", -- "mipsisa32r6-unknown-linux-gnu", -- "mipsisa32r6el-unknown-linux-gnu", -- "powerpc-unknown-linux-gnu", -- "powerpc-unknown-linux-gnuspe", -- "powerpc-unknown-linux-musl", -- "powerpc-unknown-netbsd", -- "powerpc-unknown-openbsd", -- "powerpc-wrs-vxworks", -- "powerpc-wrs-vxworks-spe", -- "riscv32gc-unknown-linux-gnu", -- "riscv32gc-unknown-linux-musl", -- "riscv32imac-unknown-none-elf", -- "thumbv7em-none-eabi", -- "thumbv7em-none-eabihf", -- "thumbv7m-none-eabi", -- "thumbv8m.base-none-eabi", -- "thumbv8m.main-none-eabi", -- "thumbv8m.main-none-eabihf", -- "mipsel-sony-psp", -- "thumbv4t-none-eabi", -- "thumbv6m-none-eabi", -+ "arm", -+ "armebv7r", -+ "armv4t", -+ "armv5te", -+ "armv7r", -+ "hexagon", -+ "mips", -+ "mipsel", -+ "mipsisa32r6", -+ "mipsisa32r6el", -+ "powerpc", -+ "riscv32", -+ "riscv32gc", -+ "riscv32imac", -+ "thumbv7em", -+ "thumbv7m", -+ "thumbv8m.base", -+ "thumbv8m.main", -+ "mipsel", -+ "thumbv4t", -+ "thumbv6m", - ]; - #[allow(dead_code)] - const NO_ATOMIC: &[&str] = &[ -- "avr-unknown-gnu-atmega328", -- "msp430-none-elf", -- "riscv32i-unknown-none-elf", -- "riscv32imc-unknown-none-elf", -+ "avr", -+ "msp430", -+ "riscv32i", -+ "riscv32imc", - ]; diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb index 335d891f05..6c4850271d 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb @@ -18,7 +18,6 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ - file://0001-crossbeam-utils-check-only-the-architecture-not-the-.patch \ file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ @@ -39,6 +38,9 @@ export RUST_TARGET_PATH export RUST_TARGET = "${HOST_SYS}" +RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" + # rust-cross writes the target linker binary into target json definition without any flags. # This breaks here because the linker isn't going to work without at least knowing where # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target 2021-11-05 8:48 ` [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target Alexander Kanavin @ 2021-11-05 17:22 ` Khem Raj 2021-11-06 7:49 ` Khem Raj 1 sibling, 0 replies; 9+ messages in thread From: Khem Raj @ 2021-11-05 17:22 UTC (permalink / raw) To: Alexander Kanavin, openembedded-core; +Cc: Alexander Kanavin On 11/5/21 1:48 AM, Alexander Kanavin wrote: > Do not try to mangle the upstream list of targets; > after discussion with upstream it turns out it's neither > necessary nor upstreamable: > https://github.com/crossbeam-rs/crossbeam/pull/751 > right, I had my reservations about this patch as well. We should try to play with rust's target detection as much as we can. > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...check-only-the-architecture-not-the-.patch | 143 ------------------ > meta/recipes-gnome/librsvg/librsvg_2.52.3.bb | 4 +- > 2 files changed, 3 insertions(+), 144 deletions(-) > delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > > diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > deleted file mode 100644 > index 0c1cf59eff..0000000000 > --- a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > +++ /dev/null > @@ -1,143 +0,0 @@ > -From 70557b217644901daaf9d8ef793f5e84c937762e Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Tue, 5 Oct 2021 23:41:59 +0200 > -Subject: [PATCH] crossbeam-utils: check only the architecture, not the whole > - target string > - > -There can be custom targets in use, and it's not possible to make a list > -of them; for the check only the first item in the target string is actually > -relevant (the architecture of the target). > - > -Upstream-Status: Pending [needs an upstream ticket and possibly a rework of list generator script] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - vendor/crossbeam-utils/.cargo-checksum.json | 4 +- > - vendor/crossbeam-utils/build.rs | 8 ++- > - vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++------------- > - 3 files changed, 38 insertions(+), 52 deletions(-) > - > ---- a/vendor/crossbeam-utils/.cargo-checksum.json > -+++ b/vendor/crossbeam-utils/.cargo-checksum.json > -@@ -1 +1,3 @@ > --{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} > -\ No newline at end of file > -+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d", > -+"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354", > -+"no_atomic.rs":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} > ---- a/vendor/crossbeam-utils/build.rs > -+++ b/vendor/crossbeam-utils/build.rs > -@@ -20,17 +20,19 @@ fn main() { > - } > - }; > - > -+ let target_arch = target.split('-').next().unwrap_or_default(); > -+ > - // Note that this is `no_*`, not `has_*`. This allows treating > - // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't > - // run. This is needed for compatibility with non-cargo build systems that > - // don't run the build script. > -- if NO_ATOMIC_CAS.contains(&&*target) { > -+ if NO_ATOMIC_CAS.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic_cas"); > - } > -- if NO_ATOMIC.contains(&&*target) { > -+ if NO_ATOMIC.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic"); > - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); > -- } else if NO_ATOMIC_64.contains(&&*target) { > -+ } else if NO_ATOMIC_64.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); > - } else { > - // Otherwise, assuming `"max-atomic-width" == 64`. > ---- a/vendor/crossbeam-utils/no_atomic.rs > -+++ b/vendor/crossbeam-utils/no_atomic.rs > -@@ -2,58 +2,41 @@ > - // It is not intended for manual editing. > - > - const NO_ATOMIC_CAS: &[&str] = &[ > -- "avr-unknown-gnu-atmega328", > -- "msp430-none-elf", > -- "riscv32i-unknown-none-elf", > -- "riscv32imc-unknown-none-elf", > -- "thumbv4t-none-eabi", > -- "thumbv6m-none-eabi", > -+ "avr", > -+ "msp430", > -+ "riscv32i", > -+ "riscv32imc", > -+ "thumbv4t", > -+ "thumbv6m", > - ]; > - #[allow(dead_code)] > - const NO_ATOMIC_64: &[&str] = &[ > -- "arm-linux-androideabi", > -- "armebv7r-none-eabi", > -- "armebv7r-none-eabihf", > -- "armv4t-unknown-linux-gnueabi", > -- "armv5te-unknown-linux-gnueabi", > -- "armv5te-unknown-linux-musleabi", > -- "armv5te-unknown-linux-uclibceabi", > -- "armv7r-none-eabi", > -- "armv7r-none-eabihf", > -- "hexagon-unknown-linux-musl", > -- "mips-unknown-linux-gnu", > -- "mips-unknown-linux-musl", > -- "mips-unknown-linux-uclibc", > -- "mipsel-unknown-linux-gnu", > -- "mipsel-unknown-linux-musl", > -- "mipsel-unknown-linux-uclibc", > -- "mipsel-unknown-none", > -- "mipsisa32r6-unknown-linux-gnu", > -- "mipsisa32r6el-unknown-linux-gnu", > -- "powerpc-unknown-linux-gnu", > -- "powerpc-unknown-linux-gnuspe", > -- "powerpc-unknown-linux-musl", > -- "powerpc-unknown-netbsd", > -- "powerpc-unknown-openbsd", > -- "powerpc-wrs-vxworks", > -- "powerpc-wrs-vxworks-spe", > -- "riscv32gc-unknown-linux-gnu", > -- "riscv32gc-unknown-linux-musl", > -- "riscv32imac-unknown-none-elf", > -- "thumbv7em-none-eabi", > -- "thumbv7em-none-eabihf", > -- "thumbv7m-none-eabi", > -- "thumbv8m.base-none-eabi", > -- "thumbv8m.main-none-eabi", > -- "thumbv8m.main-none-eabihf", > -- "mipsel-sony-psp", > -- "thumbv4t-none-eabi", > -- "thumbv6m-none-eabi", > -+ "arm", > -+ "armebv7r", > -+ "armv4t", > -+ "armv5te", > -+ "armv7r", > -+ "hexagon", > -+ "mips", > -+ "mipsel", > -+ "mipsisa32r6", > -+ "mipsisa32r6el", > -+ "powerpc", > -+ "riscv32", > -+ "riscv32gc", > -+ "riscv32imac", > -+ "thumbv7em", > -+ "thumbv7m", > -+ "thumbv8m.base", > -+ "thumbv8m.main", > -+ "mipsel", > -+ "thumbv4t", > -+ "thumbv6m", > - ]; > - #[allow(dead_code)] > - const NO_ATOMIC: &[&str] = &[ > -- "avr-unknown-gnu-atmega328", > -- "msp430-none-elf", > -- "riscv32i-unknown-none-elf", > -- "riscv32imc-unknown-none-elf", > -+ "avr", > -+ "msp430", > -+ "riscv32i", > -+ "riscv32imc", > - ]; > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > index 335d891f05..6c4850271d 100644 > --- a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > +++ b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > @@ -18,7 +18,6 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec > > SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ > file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ > - file://0001-crossbeam-utils-check-only-the-architecture-not-the-.patch \ > file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ > file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ > file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ > @@ -39,6 +38,9 @@ export RUST_TARGET_PATH > > export RUST_TARGET = "${HOST_SYS}" > > +RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" > +RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" > + > # rust-cross writes the target linker binary into target json definition without any flags. > # This breaks here because the linker isn't going to work without at least knowing where > # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#157886): https://lists.openembedded.org/g/openembedded-core/message/157886 > Mute This Topic: https://lists.openembedded.org/mt/86836028/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target 2021-11-05 8:48 ` [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target Alexander Kanavin 2021-11-05 17:22 ` [OE-core] " Khem Raj @ 2021-11-06 7:49 ` Khem Raj 1 sibling, 0 replies; 9+ messages in thread From: Khem Raj @ 2021-11-06 7:49 UTC (permalink / raw) To: Alexander Kanavin Cc: Patches and discussions about the oe-core layer, Alexander Kanavin On Fri, Nov 5, 2021 at 1:48 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Do not try to mangle the upstream list of targets; > after discussion with upstream it turns out it's neither > necessary nor upstreamable: > https://github.com/crossbeam-rs/crossbeam/pull/751 > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...check-only-the-architecture-not-the-.patch | 143 ------------------ > meta/recipes-gnome/librsvg/librsvg_2.52.3.bb | 4 +- > 2 files changed, 3 insertions(+), 144 deletions(-) > delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > > diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > deleted file mode 100644 > index 0c1cf59eff..0000000000 > --- a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch > +++ /dev/null > @@ -1,143 +0,0 @@ > -From 70557b217644901daaf9d8ef793f5e84c937762e Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Tue, 5 Oct 2021 23:41:59 +0200 > -Subject: [PATCH] crossbeam-utils: check only the architecture, not the whole > - target string > - > -There can be custom targets in use, and it's not possible to make a list > -of them; for the check only the first item in the target string is actually > -relevant (the architecture of the target). > - > -Upstream-Status: Pending [needs an upstream ticket and possibly a rework of list generator script] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - vendor/crossbeam-utils/.cargo-checksum.json | 4 +- > - vendor/crossbeam-utils/build.rs | 8 ++- > - vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++------------- > - 3 files changed, 38 insertions(+), 52 deletions(-) > - > ---- a/vendor/crossbeam-utils/.cargo-checksum.json > -+++ b/vendor/crossbeam-utils/.cargo-checksum.json > -@@ -1 +1,3 @@ > --{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} > -\ No newline at end of file > -+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d", > -+"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354", > -+"no_atomic.rs":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"} > ---- a/vendor/crossbeam-utils/build.rs > -+++ b/vendor/crossbeam-utils/build.rs > -@@ -20,17 +20,19 @@ fn main() { > - } > - }; > - > -+ let target_arch = target.split('-').next().unwrap_or_default(); > -+ > - // Note that this is `no_*`, not `has_*`. This allows treating > - // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't > - // run. This is needed for compatibility with non-cargo build systems that > - // don't run the build script. > -- if NO_ATOMIC_CAS.contains(&&*target) { > -+ if NO_ATOMIC_CAS.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic_cas"); > - } > -- if NO_ATOMIC.contains(&&*target) { > -+ if NO_ATOMIC.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic"); > - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); > -- } else if NO_ATOMIC_64.contains(&&*target) { > -+ } else if NO_ATOMIC_64.contains(&&*target_arch) { > - println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); > - } else { > - // Otherwise, assuming `"max-atomic-width" == 64`. > ---- a/vendor/crossbeam-utils/no_atomic.rs > -+++ b/vendor/crossbeam-utils/no_atomic.rs > -@@ -2,58 +2,41 @@ > - // It is not intended for manual editing. > - > - const NO_ATOMIC_CAS: &[&str] = &[ > -- "avr-unknown-gnu-atmega328", > -- "msp430-none-elf", > -- "riscv32i-unknown-none-elf", > -- "riscv32imc-unknown-none-elf", > -- "thumbv4t-none-eabi", > -- "thumbv6m-none-eabi", > -+ "avr", > -+ "msp430", > -+ "riscv32i", > -+ "riscv32imc", > -+ "thumbv4t", > -+ "thumbv6m", > - ]; > - #[allow(dead_code)] > - const NO_ATOMIC_64: &[&str] = &[ > -- "arm-linux-androideabi", > -- "armebv7r-none-eabi", > -- "armebv7r-none-eabihf", > -- "armv4t-unknown-linux-gnueabi", > -- "armv5te-unknown-linux-gnueabi", > -- "armv5te-unknown-linux-musleabi", > -- "armv5te-unknown-linux-uclibceabi", > -- "armv7r-none-eabi", > -- "armv7r-none-eabihf", > -- "hexagon-unknown-linux-musl", > -- "mips-unknown-linux-gnu", > -- "mips-unknown-linux-musl", > -- "mips-unknown-linux-uclibc", > -- "mipsel-unknown-linux-gnu", > -- "mipsel-unknown-linux-musl", > -- "mipsel-unknown-linux-uclibc", > -- "mipsel-unknown-none", > -- "mipsisa32r6-unknown-linux-gnu", > -- "mipsisa32r6el-unknown-linux-gnu", > -- "powerpc-unknown-linux-gnu", > -- "powerpc-unknown-linux-gnuspe", > -- "powerpc-unknown-linux-musl", > -- "powerpc-unknown-netbsd", > -- "powerpc-unknown-openbsd", > -- "powerpc-wrs-vxworks", > -- "powerpc-wrs-vxworks-spe", > -- "riscv32gc-unknown-linux-gnu", > -- "riscv32gc-unknown-linux-musl", > -- "riscv32imac-unknown-none-elf", > -- "thumbv7em-none-eabi", > -- "thumbv7em-none-eabihf", > -- "thumbv7m-none-eabi", > -- "thumbv8m.base-none-eabi", > -- "thumbv8m.main-none-eabi", > -- "thumbv8m.main-none-eabihf", > -- "mipsel-sony-psp", > -- "thumbv4t-none-eabi", > -- "thumbv6m-none-eabi", > -+ "arm", > -+ "armebv7r", > -+ "armv4t", > -+ "armv5te", > -+ "armv7r", > -+ "hexagon", > -+ "mips", > -+ "mipsel", > -+ "mipsisa32r6", > -+ "mipsisa32r6el", > -+ "powerpc", > -+ "riscv32", > -+ "riscv32gc", > -+ "riscv32imac", > -+ "thumbv7em", > -+ "thumbv7m", > -+ "thumbv8m.base", > -+ "thumbv8m.main", > -+ "mipsel", > -+ "thumbv4t", > -+ "thumbv6m", > - ]; > - #[allow(dead_code)] > - const NO_ATOMIC: &[&str] = &[ > -- "avr-unknown-gnu-atmega328", > -- "msp430-none-elf", > -- "riscv32i-unknown-none-elf", > -- "riscv32imc-unknown-none-elf", > -+ "avr", > -+ "msp430", > -+ "riscv32i", > -+ "riscv32imc", > - ]; > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > index 335d891f05..6c4850271d 100644 > --- a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > +++ b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb > @@ -18,7 +18,6 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec > > SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ > file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ > - file://0001-crossbeam-utils-check-only-the-architecture-not-the-.patch \ > file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ > file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ > file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ > @@ -39,6 +38,9 @@ export RUST_TARGET_PATH > > export RUST_TARGET = "${HOST_SYS}" > > +RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" > +RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" > + we also need to disable it for riscv32 and mipsel too. I will send a followup. > # rust-cross writes the target linker binary into target json definition without any flags. > # This breaks here because the linker isn't going to work without at least knowing where > # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class > -- > 2.20.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#157886): https://lists.openembedded.org/g/openembedded-core/message/157886 > Mute This Topic: https://lists.openembedded.org/mt/86836028/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 6/7] libxml2: mark patch as non-upstreamable 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin ` (3 preceding siblings ...) 2021-11-05 8:48 ` [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 2021-11-05 8:48 ` [PATCH 7/7] libpcre/libpcre2: correct SRC_URI Alexander Kanavin 5 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../libxml/libxml2/libxml-m4-use-pkgconfig.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch index 90fa193775..a5c112db7b 100644 --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch +++ b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch @@ -5,7 +5,11 @@ Subject: [PATCH] AM_PATH_XML2 uses xml-config which we disable through binconfig-disabled.bbclass, so port it to use pkg-config instead. -Upstream-Status: Pending +This cannot be upstreamed, as the original macro supports various +optional arguments which cannot be supported with a direct call +to pkg-config. + +Upstream-Status: Inappropriate [oe-core specific; see above] Signed-off-by: Ross Burton <ross.burton@intel.com> Rebase to 2.9.9 -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/7] libpcre/libpcre2: correct SRC_URI 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin ` (4 preceding siblings ...) 2021-11-05 8:48 ` [PATCH 6/7] libxml2: mark patch as non-upstreamable Alexander Kanavin @ 2021-11-05 8:48 ` Alexander Kanavin 5 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-11-05 8:48 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin http://ftp.pcre.org is down, take sources according to links on http://www.pcre.org Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/recipes-support/libpcre/libpcre2_10.37.bb | 4 +++- meta/recipes-support/libpcre/libpcre_8.45.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre2_10.37.bb b/meta/recipes-support/libpcre/libpcre2_10.37.bb index e0ead59da6..ccedf688d7 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.37.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.37.bb @@ -10,7 +10,9 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=6b3022283c9a79238d521848ea9dcb4d" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" +SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" + +UPSTREAM_CHECK_URI = "https://github.com/PhilipHazel/pcre2/releases" SRC_URI[sha256sum] = "4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270" diff --git a/meta/recipes-support/libpcre/libpcre_8.45.bb b/meta/recipes-support/libpcre/libpcre_8.45.bb index 76b20f5f08..46fedbae48 100644 --- a/meta/recipes-support/libpcre/libpcre_8.45.bb +++ b/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -- 2.20.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-11-06 7:49 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-05 8:48 [PATCH 1/7] gdbm: upgrade 1.19 -> 1.22 Alexander Kanavin 2021-11-05 8:48 ` [PATCH 2/7] perl: backport gdbm 1.2x compatibility fixes Alexander Kanavin 2021-11-05 8:48 ` [PATCH 3/7] valgrind: mark ptest-specific patch as inappropriate Alexander Kanavin 2021-11-05 8:48 ` [PATCH 4/7] systemd-bootchart: submit musl patches upstream Alexander Kanavin 2021-11-05 8:48 ` [PATCH 5/7] librsvg: set the needed atomic configuration flags directly per-target Alexander Kanavin 2021-11-05 17:22 ` [OE-core] " Khem Raj 2021-11-06 7:49 ` Khem Raj 2021-11-05 8:48 ` [PATCH 6/7] libxml2: mark patch as non-upstreamable Alexander Kanavin 2021-11-05 8:48 ` [PATCH 7/7] libpcre/libpcre2: correct SRC_URI Alexander Kanavin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.