abseil-cpp/grpc: Remove version override We have update the base version of abseil-cpp in meta-oe and will not need this override anymore. Tested: - platform5: http://fusion2/fbd4f274-0561-31e5-b132-a3fc4365536d - platform15: http://fusion2/cc372ad5-f7a4-3def-9c11-2828b9a09562 - platform18: http://fusion2/42c37380-6793-3ae1-9166-549b840cfc8b - platform17: http://fusion2/26070480-54cb-3279-afb8-cf147e9c3051 - platform11+ext: http://fusion2/6794dea6-088e-343b-a45e-c9911e809924 - platform11: http://fusion2/3c008d0c-f51c-3c60-99b1-9caa4604f710 - platform25: http://fusion2/f611d1b8-d45f-32cc-a6b0-fe9b2bf10224 Google-Bug-Id: 481049523 Google-Bug-Id: 482101011 Change-Id: Ieb5922dc9d2d31e592695701067785c9f98af67c Signed-off-by: Willy Tu <wltu@google.com>
diff --git a/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch deleted file mode 100644 index 6fecf25..0000000 --- a/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ /dev/null
@@ -1,38 +0,0 @@ -From 11faa06436fdeb0c9948080a11f9a99d3b5ba16c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 9 Apr 2020 13:06:27 -0700 -Subject: [PATCH] absl: always use <asm/sgidefs.h> - -Fixes mips/musl build, since sgidefs.h is not present on all C libraries -but on linux asm/sgidefs.h is there and contains same definitions, using -that makes it portable. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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 1beb2ee4..140b0697 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. --#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__ || !__GLIBC__ - #endif // __mips__ - - // SYS_mmap and SYS_munmap are not defined in Android. --- -2.25.1 -
diff --git a/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch b/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch deleted file mode 100644 index fa5f461..0000000 --- a/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch +++ /dev/null
@@ -1,103 +0,0 @@ -From 849ee69234f0fd76c41a874763b1aac0c3dba12f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 21 Sep 2024 20:53:06 +0800 -Subject: [PATCH] abseil: ppc fixes - -An all-in-one patch that fixes several issues: - -1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) -2) powerpc stacktrace implementation only works on glibc (disabled on musl) -3) powerpc stacktrace implementation has ppc64 assumptions (fixed) -4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) - -Sourced from void linux - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - absl/base/internal/unscaledcycleclock.cc | 4 ++-- - absl/base/internal/unscaledcycleclock_config.h | 3 ++- - absl/debugging/internal/examine_stack.cc | 8 +++++++- - absl/debugging/internal/stacktrace_config.h | 2 +- - 4 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index 68f92730..5dbfaab6 100644 ---- a/absl/base/internal/unscaledcycleclock.cc -+++ b/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include <intrin.h> - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #ifdef __GLIBC__ - #include <sys/platform/ppc.h> - #elif defined(__FreeBSD__) -@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - #ifdef __GLIBC__ -diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h -index 43a3dabe..196a8535 100644 ---- a/absl/base/internal/unscaledcycleclock_config.h -+++ b/absl/base/internal/unscaledcycleclock_config.h -@@ -21,7 +21,8 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(_M_IX86) || \ - (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else -diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc -index 3dd6ba1a..f923b055 100644 ---- a/absl/debugging/internal/examine_stack.cc -+++ b/absl/debugging/internal/examine_stack.cc -@@ -36,6 +36,10 @@ - #include <csignal> - #include <cstdio> - -+#if defined(__powerpc__) -+#include <asm/ptrace.h> -+#endif -+ - #include "absl/base/attributes.h" - #include "absl/base/internal/raw_logging.h" - #include "absl/base/macros.h" -@@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { - return reinterpret_cast<void*>(context->uc_mcontext.pc); - #elif defined(__powerpc64__) - return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); --#elif defined(__powerpc__) -+#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]); -+#elif defined(__powerpc__) -+ return reinterpret_cast<void*>((context->uc_regs)->gregs[32]); - #elif defined(__riscv) - return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) -diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h -index 88949fe9..4e26a6b7 100644 ---- a/absl/debugging/internal/stacktrace_config.h -+++ b/absl/debugging/internal/stacktrace_config.h -@@ -67,7 +67,7 @@ - #elif defined(__i386__) || defined(__x86_64__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_x86-inl.inc" --#elif defined(__ppc__) || defined(__PPC__) -+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_powerpc-inl.inc" - #elif defined(__aarch64__) --- -2.50.0.rc2.692.g299adb8693-goog -
diff --git a/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend b/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend index 68393ab..78641e7 100644 --- a/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend +++ b/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend
@@ -1,5 +1,3 @@ -EXTRA_OECMAKE:append:gbmc = " -DCMAKE_CXX_STANDARD=17" - FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:" SRC_URI:append:gbmc = " file://0001-Set-NDEBUG-to-true-to-avoid-DebugOnlyChecks.patch"
diff --git a/recipes-devtools/abseil-cpp/abseil-cpp_20250814.0.bb b/recipes-devtools/abseil-cpp/abseil-cpp_20250814.0.bb deleted file mode 100644 index 1a010da..0000000 --- a/recipes-devtools/abseil-cpp/abseil-cpp_20250814.0.bb +++ /dev/null
@@ -1,51 +0,0 @@ -SUMMARY = "Abseil is a cpp library like STL" -DESCRIPTION = "Abseil provides pieces missing from the C++ standard. Contains \ -additional useful libraries like algorithm, container, debugging, hash, memory, \ -meta, numeric, strings, synchronization, time, types and utility." -HOMEPAGE = "https://abseil.io/" -SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" - -SRCREV = "987c57f325f7fa8472fa84e1f885f7534d391b0d" -BRANCH = "lts_2025_08_14" -SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ - file://0001-absl-always-use-asm-sgidefs.h.patch \ - file://0002-abseil-ppc-fixes.patch \ - " - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF \ - -DABSL_ENABLE_INSTALL=ON \ - " - -SYSROOT_DIRS:append:class-nativesdk:mingw32 = " ${bindir}" - -PACKAGES_DYNAMIC += "^libabsl-*" -PACKAGES_DYNAMIC:class-native = "" - -PACKAGESPLITFUNCS =+ "split_dynamic_packages" - -python split_dynamic_packages() { - libdir = d.getVar('libdir') - - libpackages = do_split_packages( - d, - root=libdir, - file_regex=r'^libabsl_(.*)\.so\..*$', - output_pattern='libabsl-%s', - description="abseil shared library %s", - prepend=True, - extra_depends='', - ) - if libpackages: - d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(libpackages)) -} - -ALLOW_EMPTY:${PN} = "1" - -BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch deleted file mode 100644 index 594503a..0000000 --- a/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch +++ /dev/null
@@ -1,30 +0,0 @@ -From 54e8dca9b39b8c8a6532576a0286e548f97607fa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Apr 2022 16:07:19 -0700 -Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 - -Fixes -riscv64-yoe-linux-musl/12.0.1/ld: libgrpc.so.23.0.0: undefined reference to `__atomic_exchange_1' -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06e6453b5c..476d7f1576 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -306,6 +306,9 @@ if(UNIX AND NOT HAIKU) - set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) - endif() - endif() -+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") -+ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) -+ endif() - endif() - - include(CheckCXXSourceCompiles)
diff --git a/recipes-devtools/grpc/grpc_1.81.0.bb b/recipes-devtools/grpc/grpc_1.81.0.bb deleted file mode 100644 index bd2e02d..0000000 --- a/recipes-devtools/grpc/grpc_1.81.0.bb +++ /dev/null
@@ -1,69 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=fe8c552b7748e45c00ac55ac0257f6c9 \ - file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \ - file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \ -" - -DEPENDS = "abseil-cpp c-ares openssl protobuf protobuf-native re2 zlib" -DEPENDS:append:class-target = " grpc-native" -DEPENDS:append:class-nativesdk = " grpc-native " - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" -# Configuration above allows to cross-compile gRPC applications -# In order to compile applications on the target, use the dependency below -# Both dependencies are mutually exclusive -# RDEPENDS:${PN}-dev += "${PN}-compiler" - -S = "${WORKDIR}/git" -SRCREV = "8bdf11e5097abecbe6cffb70866625a0b8044948" -BRANCH = "v1.81.x" -SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ - file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - " - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DgRPC_INSTALL_LIBDIR=${baselib} \ - -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ - " - -PACKAGECONFIG ??= "cpp shared" -PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" -PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" -PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" -PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" -PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" -PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" -PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" -PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:prepend() { - sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -FILES:${PN}-compiler += " \ - ${bindir} \ - ${libdir}/libgrpc_plugin_support${SOLIBS} \ - "
diff --git a/recipes-devtools/grpc/grpc_1.83.1.bbappend b/recipes-devtools/grpc/grpc_1.83.1.bbappend new file mode 100644 index 0000000..3c8c0ef --- /dev/null +++ b/recipes-devtools/grpc/grpc_1.83.1.bbappend
@@ -0,0 +1,3 @@ +S = "${WORKDIR}/git" +SRC_URI:remove = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV}" +SRC_URI:prepend = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} "
diff --git a/recipes-devtools/protobuf/protobuf_6.33.6.bbappend b/recipes-devtools/protobuf/protobuf_6.33.6.bbappend new file mode 100644 index 0000000..1d28929 --- /dev/null +++ b/recipes-devtools/protobuf/protobuf_6.33.6.bbappend
@@ -0,0 +1,2 @@ +SRC_URI:remove = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=${PROTOC_VERSION}" +SRC_URI:prepend = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https " \ No newline at end of file