Skip to contentSkip to conversation

abseil-cpp: upgrade 20211102 -> 20220623

PATCH New Wang Mingyu 2 participants 6 messages Jul 4, 2022 – Jul 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 abseil-cpp: upgrade 20211102 -> 20220623

0001-absl-always-use-asm-sgidefs.h.patch
refreshed for new verion.

---
 .../abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch  | 9 +++++----
 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)
meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +5 -4
index a5bebf5f0..5242b29e0 100644
@@ -10,29 +10,30 @@ that makes it portable.
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  absl/base/internal/direct_mmap.h | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
-index a01d61220376..c8a4fbabbb3a 100644
+index e492bb0..c8a4fba 100644
 --- a/absl/base/internal/direct_mmap.h
 +++ b/absl/base/internal/direct_mmap.h
 @@ -41,13 +41,9 @@
  
  #ifdef __mips__
  // Include definitions of the ABI currently in use.
--#ifdef __BIONIC__
+-#if defined(__BIONIC__) || !defined(__GLIBC__)
 -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the
 +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the
  // definitions we need.
  #include <asm/sgidefs.h>
 -#else
 -#include <sgidefs.h>
--#endif  // __BIONIC__
+-#endif  // __BIONIC__ || !__GLIBC__
  #endif  // __mips__
  
  // SYS_mmap and SYS_munmap are not defined in Android.
 -- 
-2.36.1
+2.25.1
 
meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +3 -3
index b271134fd..b3dc06ca1 100644
@@ -7,9 +7,9 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
 
-PV = "20211102.1+git${SRCPV}"
-SRCREV = "7c6608d0dbe43cf9bdf7f77787bc6bc89cc42f8b"
-BRANCH = "master"
+PV = "20220623.0"
+SRCREV = "273292d1cfc0a94a65082ee350509af1d113344d"
+BRANCH = "lts_2022_06_23"
 SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
            file://0001-absl-always-use-asm-sgidefs.h.patch             \
            file://0002-Remove-maes-option-from-cross-compilation.patch \
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 bats: upgrade 1.6.1 -> 1.7.0

Changelog:https://github.com/bats-core/bats-core/releases/tag/v1.7.0

---
 meta-oe/recipes-test/bats/{bats_1.6.1.bb => bats_1.7.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/bats/{bats_1.6.1.bb => bats_1.7.0.bb} (94%)
meta-oe/recipes-test/bats/bats_1.7.0.bb renamed from meta-oe/recipes-test/bats/bats_1.6.1.bb +2 -2
similarity index 94%
rename from meta-oe/recipes-test/bats/bats_1.6.1.bb
rename to meta-oe/recipes-test/bats/bats_1.7.0.bb
index 7d72a5198..56b47959d 100644
@@ -10,8 +10,8 @@ SRC_URI = "\
   git://github.com/bats-core/bats-core.git;branch=version/1.6.x;protocol=https \
   "
 
-# v1.6.1
-SRCREV = "1977254c2a7faa2e0af17355856f91dc471d1daa"
+# v1.7.0
+SRCREV = "410dd229a5ed005c68167cc90ed0712ad2a1c909"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1
#2 lore raw

Re: [oe] [meta-oe] [PATCH] bats: upgrade 1.6.1 -> 1.7.0

Quoted 17 lines · wangmy

Changelog:https://github.com/bats-core/bats-core/releases/tag/v1.7.0

---
 meta-oe/recipes-test/bats/{bats_1.6.1.bb => bats_1.7.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/bats/{bats_1.6.1.bb => bats_1.7.0.bb} (94%)
meta-oe/recipes-test/bats/bats_1.7.0.bb renamed from meta-oe/recipes-test/bats/bats_1.6.1.bb +0 -0
similarity index 94%
rename from meta-oe/recipes-test/bats/bats_1.6.1.bb
rename to meta-oe/recipes-test/bats/bats_1.7.0.bb
index 7d72a5198..56b47959d 100644

meta-oe/recipes-test/bats/bats_1.7.0.bb SRC_URI = "\ · line 10

Quoted 1 line
meta-oe/recipes-test/bats/bats_1.7.0.bb renamed from meta-oe/recipes-test/bats/bats_1.6.1.bb +0 -0
@@ -10,8 +10,8 @@ SRC_URI = "\
   git://github.com/bats-core/bats-core.git;branch=version/1.6.x;protocol=https \

this would need branch= to be updated as well to perhaps 1.7.x currently it fails to build

stdio: ERROR: bats-1.7.0-r0 do_fetch: Fetcher failure: Unable to find revision 410dd229a5ed005c68167cc90ed0712ad2a1c909 in branch version/1.6.x even from upstream

Quoted 21 lines
meta-oe/recipes-test/bats/bats_1.7.0.bb renamed from meta-oe/recipes-test/bats/bats_1.6.1.bb +2 -3
   "
 
-# v1.6.1
-SRCREV = "1977254c2a7faa2e0af17355856f91dc471d1daa"
+# v1.7.0
+SRCREV = "410dd229a5ed005c68167cc90ed0712ad2a1c909"
 
 S = "${WORKDIR}/git"
 
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97683): https://lists.openembedded.org/g/openembedded-devel/message/97683
Mute This Topic: https://lists.openembedded.org/mt/92161465/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw

PATCH 1/1 capnproto: upgrade 0.9.1 -> 0.10.2

In reply to Wang Mingyu
---
 .../capnproto/{capnproto_0.9.1.bb => capnproto_0.10.2.bb}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/capnproto/{capnproto_0.9.1.bb => capnproto_0.10.2.bb} (93%)
meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb renamed from meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb +1 -1
similarity index 93%
rename from meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb
rename to meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb
index d14bd843e..3d4f549b6 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
 
 SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \
            "
-SRCREV = "b49431c48d40490ef979247d308af63345376cee"
+SRCREV = "2e88221d3dde22266bfccf40eaee6ff9b40d113d"
 
 S = "${WORKDIR}/git/c++"
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH 1/1 catch2: upgrade 2.13.7 -> 3.0.1

In reply to Wang Mingyu
---
 .../recipes-test/catch2/{catch2_2.13.7.bb => catch2_3.0.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/catch2/{catch2_2.13.7.bb => catch2_3.0.1.bb} (82%)
meta-oe/recipes-test/catch2/catch2_3.0.1.bb renamed from meta-oe/recipes-test/catch2/catch2_2.13.7.bb +2 -2
similarity index 82%
rename from meta-oe/recipes-test/catch2/catch2_2.13.7.bb
rename to meta-oe/recipes-test/catch2/catch2_3.0.1.bb
index ed50f659d..c6fd36806 100644
@@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https"
-SRCREV = "c4e3767e265808590986d5db6ca1b5532a7f3d13"
+SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https"
+SRCREV = "605a34765aa5d5ecbf476b4598a862ada971b0cc"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1
#5 lore raw

Re: [oe] [meta-oe] [PATCH] catch2: upgrade 2.13.7 -> 3.0.1

we have libgpiod which still needs catch2 so please look into fixing libgpiod as well. It fails currently

| ../../../../libgpiod-1.6.3/bindings/cxx/tests/gpiod-cxx-test-main.cpp:9:10:
fatal error: catch2/catch.hpp: No such file or directory

|     9 | #include <catch2/catch.hpp>
|       |          ^~~~~~~~~~~~~~~~~~
| compilation terminated.

you have to enable ptest DISTRO_FEATURE to get to this error.

Quoted 37 lines · wangmy
---
 .../recipes-test/catch2/{catch2_2.13.7.bb => catch2_3.0.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/catch2/{catch2_2.13.7.bb => catch2_3.0.1.bb} (82%)
meta-oe/recipes-test/catch2/catch2_3.0.1.bb renamed from meta-oe/recipes-test/catch2/catch2_2.13.7.bb +2 -3
similarity index 82%
rename from meta-oe/recipes-test/catch2/catch2_2.13.7.bb
rename to meta-oe/recipes-test/catch2/catch2_3.0.1.bb
index ed50f659d..c6fd36806 100644
@@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https"
-SRCREV = "c4e3767e265808590986d5db6ca1b5532a7f3d13"
+SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https"
+SRCREV = "605a34765aa5d5ecbf476b4598a862ada971b0cc"
 
 S = "${WORKDIR}/git"
 
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97685): https://lists.openembedded.org/g/openembedded-devel/message/97685
Mute This Topic: https://lists.openembedded.org/mt/92161469/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-