* [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0
@ 2025-03-11 7:35 Hongxu Jia
2025-03-11 7:35 ` [meta-oe][PATCH 2/2] xmlrpc-c: 1.60.03 -> 1.64.0 Hongxu Jia
2025-03-11 7:40 ` [oe] [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Yi Zhao
0 siblings, 2 replies; 4+ messages in thread
From: Hongxu Jia @ 2025-03-11 7:35 UTC (permalink / raw)
To: openembedded-devel
Refresh local patches
- 0001-Fix-build-on-mips-clang.patch
- 0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
Changelog:
https://github.com/protocolbuffers/protobuf/releases/tag/v30.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../0001-Fix-build-on-mips-clang.patch | 26 +++++++++++-------
...e-respect-CXX-LDFLAGS-variables-fix-.patch | 27 ++++++++++---------
...{protobuf_4.25.5.bb => protobuf_4.30.0.bb} | 4 +--
3 files changed, 33 insertions(+), 24 deletions(-)
rename meta-oe/recipes-devtools/protobuf/{protobuf_4.25.5.bb => protobuf_4.30.0.bb} (98%)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
index 9f6116c4c4..6db22c26d3 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
@@ -1,6 +1,6 @@
-From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001
+From fd5a966a6385165506a1b84298465cbb9f44222d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 31 Oct 2021 23:39:44 -0700
+Date: Mon, 10 Mar 2025 19:59:19 -0700
Subject: [PATCH] Fix build on mips/clang
clang13 crashes on mips, until its fixed upstream disable tailcall on
@@ -10,17 +10,25 @@ https://bugs.llvm.org/show_bug.cgi?id=52367
Upstream-Status: Inappropriate [Clang workaround]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to v4.30.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- src/google/protobuf/port_def.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/google/protobuf/port_def.inc | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
+index 35f49afb4..e9597af0d 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
-@@ -255,6 +255,7 @@
+@@ -222,6 +222,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#error PROTOBUF_TAILCALL was previously defined
#endif
- #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
+ #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \
+ !defined(__mips__) && \
- !defined(_ARCH_PPC) && !defined(__wasm__) && \
- !(defined(_MSC_VER) && defined(_M_IX86)) && \
- !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
+ !defined(_ARCH_PPC) && !defined(__wasm__) && \
+ !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__)
+ // Compilation fails on ARM32: b/195943306
+--
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
index 7c4bf260eb..95a48017b1 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
@@ -1,6 +1,6 @@
-From e3fa241637ab5a7fa78c0d474802134cff75f91e Mon Sep 17 00:00:00 2001
+From fe2d9a1df45fd2082fab717f21557fcdc0cab082 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 28 Jun 2019 13:50:52 +0000
+Date: Mon, 10 Mar 2025 20:05:47 -0700
Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
with gold
@@ -25,12 +25,14 @@ Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+Rebase to v4.30.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- examples/Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ examples/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/examples/Makefile b/examples/Makefile
-index ef7a4ef58..7206e14e1 100644
+index 5290fdb03..523532f35 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -2,6 +2,8 @@
@@ -42,20 +44,19 @@ index ef7a4ef58..7206e14e1 100644
all: cpp java python
cpp: add_person_cpp list_people_cpp
-@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto
-
+@@ -47,10 +49,11 @@ protoc_middleman_ruby: addressbook.proto
add_person_cpp: add_person.cc protoc_middleman
pkg-config --cflags protobuf # fails if protobuf is not installed
-- c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
+ c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
list_people_cpp: list_people.cc protoc_middleman
pkg-config --cflags protobuf # fails if protobuf is not installed
-- c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
+- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
add_person_dart: add_person.dart protoc_middleman_dart
---
-2.34.1
+--
+2.25.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
similarity index 98%
rename from meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
index a470a7c643..f899a1dc07 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
@@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "zlib abseil-cpp jsoncpp"
DEPENDS:append:class-target = " protobuf-native"
-SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014"
+SRCREV = "d295af5c3002c08e1bfd9d7f9e175d0a4d015f1e"
-SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
+SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=30.x;protocol=https \
file://run-ptest \
file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
"
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/2] xmlrpc-c: 1.60.03 -> 1.64.0
2025-03-11 7:35 [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Hongxu Jia
@ 2025-03-11 7:35 ` Hongxu Jia
2025-03-11 7:40 ` [oe] [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Yi Zhao
1 sibling, 0 replies; 4+ messages in thread
From: Hongxu Jia @ 2025-03-11 7:35 UTC (permalink / raw)
To: openembedded-devel
Refresh local patches:
- 0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
- 0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...rver_abyss-Fix-build-with-clang-libc.patch | 16 +++--
...nsuring-Sequential-Execution-of-rm-a.patch | 59 +++++--------------
...xmlrpc-c_1.60.03.bb => xmlrpc-c_1.64.0.bb} | 4 +-
3 files changed, 29 insertions(+), 50 deletions(-)
rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.60.03.bb => xmlrpc-c_1.64.0.bb} (93%)
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
index be83b0166c..531f0d45fb 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
@@ -1,6 +1,6 @@
-From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
+From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 13:31:39 -0800
+Date: Mon, 10 Mar 2025 20:25:02 -0700
Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
/mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
@@ -10,10 +10,15 @@ Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
+ test/cpp/server_abyss.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
+index c1b44995..14faf5a5 100644
--- a/test/cpp/server_abyss.cpp
+++ b/test/cpp/server_abyss.cpp
@@ -85,7 +85,7 @@ public:
@@ -25,3 +30,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
if (rc != 0) {
closesock(this->fd);
+--
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
index 152667661e..15e088965f 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
@@ -1,7 +1,8 @@
-From c9bd05e8f0ad805b81625cfa717d06071cfd9b48 Mon Sep 17 00:00:00 2001
+From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 16 Oct 2024 22:52:38 -0700
-Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make calls running in parallel
+Date: Mon, 10 Mar 2025 20:26:29 -0700
+Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make
+ calls running in parallel
With high parallel execution, it results in race condition where
its trying to create symlink while the original symlink while rm is
@@ -29,50 +30,14 @@ but I don't see any changes which should cause this in the git since
1.59.01, but the gentoo bug report is against 1.54.06 already.
martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil++/Makefile after-clean-j1.log
-make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
- all
+make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
+ all
--
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
libxmlrpc_util++.so
-martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil/Makefile after-clean-j1.log
-make -C libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- all
--
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
- libxmlrpc_util.so
---
-make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/Makefile \
libxmlrpc_util.so
Similar error reported here [1]
@@ -82,12 +47,15 @@ Similar error reported here [1]
Upstream-Status: Pending
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
unix-common.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/unix-common.mk b/unix-common.mk
-index 6954faf5..983c48cd 100644
+index 6954faf5..e15a4f5c 100644
--- a/unix-common.mk
+++ b/unix-common.mk
@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
@@ -107,3 +75,6 @@ index 6954faf5..983c48cd 100644
.PHONY: $(SHLIB_INSTALL_TARGETS)
.PHONY: install-shared-libraries
+--
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
similarity index 93%
rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
rename to meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
index 0e0385ab29..62ba0f53e6 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -10,8 +10,8 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
"
-# one more commit after Release 1.60.03 in the Stable series
-SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
+# one more commit after Release 1.64.0 in the Stable series
+SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
S = "${WORKDIR}/git/stable"
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0
2025-03-11 7:35 [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Hongxu Jia
2025-03-11 7:35 ` [meta-oe][PATCH 2/2] xmlrpc-c: 1.60.03 -> 1.64.0 Hongxu Jia
@ 2025-03-11 7:40 ` Yi Zhao
2025-03-11 8:42 ` hongxu
1 sibling, 1 reply; 4+ messages in thread
From: Yi Zhao @ 2025-03-11 7:40 UTC (permalink / raw)
To: hongxu.jia, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 7830 bytes --]
On 3/11/25 15:35, hongxu via lists.openembedded.org wrote:
> Refresh local patches
> - 0001-Fix-build-on-mips-clang.patch
> - 0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
>
> Changelog:
> https://github.com/protocolbuffers/protobuf/releases/tag/v30.0
>
> Signed-off-by: Hongxu Jia<hongxu.jia@windriver.com>
> ---
> .../0001-Fix-build-on-mips-clang.patch | 26 +++++++++++-------
> ...e-respect-CXX-LDFLAGS-variables-fix-.patch | 27 ++++++++++---------
> ...{protobuf_4.25.5.bb => protobuf_4.30.0.bb} | 4 +--
> 3 files changed, 33 insertions(+), 24 deletions(-)
> rename meta-oe/recipes-devtools/protobuf/{protobuf_4.25.5.bb => protobuf_4.30.0.bb} (98%)
>
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
> index 9f6116c4c4..6db22c26d3 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
> @@ -1,6 +1,6 @@
> -From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001
> +From fd5a966a6385165506a1b84298465cbb9f44222d Mon Sep 17 00:00:00 2001
> From: Khem Raj<raj.khem@gmail.com>
> -Date: Sun, 31 Oct 2021 23:39:44 -0700
> +Date: Mon, 10 Mar 2025 19:59:19 -0700
> Subject: [PATCH] Fix build on mips/clang
>
> clang13 crashes on mips, until its fixed upstream disable tailcall on
> @@ -10,17 +10,25 @@https://bugs.llvm.org/show_bug.cgi?id=52367
>
> Upstream-Status: Inappropriate [Clang workaround]
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> +
> +Rebase to v4.30.0
> +Signed-off-by: Hongxu Jia<hongxu.jia@windriver.com>
> ---
> - src/google/protobuf/port_def.inc | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + src/google/protobuf/port_def.inc | 1 +
> + 1 file changed, 1 insertion(+)
>
> +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
> +index 35f49afb4..e9597af0d 100644
> --- a/src/google/protobuf/port_def.inc
> +++ b/src/google/protobuf/port_def.inc
> -@@ -255,6 +255,7 @@
> +@@ -222,6 +222,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
> #error PROTOBUF_TAILCALL was previously defined
> #endif
> - #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
> + #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \
> + !defined(__mips__) && \
> - !defined(_ARCH_PPC) && !defined(__wasm__) && \
> - !(defined(_MSC_VER) && defined(_M_IX86)) && \
> - !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
> + !defined(_ARCH_PPC) && !defined(__wasm__) && \
> + !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__)
> + // Compilation fails on ARM32: b/195943306
> +--
> +2.25.1
> +
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
> index 7c4bf260eb..95a48017b1 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
> @@ -1,6 +1,6 @@
> -From e3fa241637ab5a7fa78c0d474802134cff75f91e Mon Sep 17 00:00:00 2001
> +From fe2d9a1df45fd2082fab717f21557fcdc0cab082 Mon Sep 17 00:00:00 2001
> From: Martin Jansa<Martin.Jansa@gmail.com>
> -Date: Fri, 28 Jun 2019 13:50:52 +0000
> +Date: Mon, 10 Mar 2025 20:05:47 -0700
> Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
> with gold
The gold linker support has been dropped in oe-core[1]. Is this patch
still needed?
[1]
https://git.openembedded.org/openembedded-core/commit/?id=a4addb9ab63011e7c604fc5daff95559e7d214e7
//Yi
>
> @@ -25,12 +25,14 @@ Upstream-Status: Pending
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> Signed-off-by: Leon Anavi<leon.anavi@konsulko.com>
>
> +Rebase to v4.30.0
> +Signed-off-by: Hongxu Jia<hongxu.jia@windriver.com>
> ---
> - examples/Makefile | 6 ++++--
> - 1 file changed, 4 insertions(+), 2 deletions(-)
> + examples/Makefile | 5 ++++-
> + 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/examples/Makefile b/examples/Makefile
> -index ef7a4ef58..7206e14e1 100644
> +index 5290fdb03..523532f35 100644
> --- a/examples/Makefile
> +++ b/examples/Makefile
> @@ -2,6 +2,8 @@
> @@ -42,20 +44,19 @@ index ef7a4ef58..7206e14e1 100644
> all: cpp java python
>
> cpp: add_person_cpp list_people_cpp
> -@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto
> -
> +@@ -47,10 +49,11 @@ protoc_middleman_ruby: addressbook.proto
> add_person_cpp: add_person.cc protoc_middleman
> pkg-config --cflags protobuf # fails if protobuf is not installed
> -- c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
> -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
> + c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
> ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
>
> list_people_cpp: list_people.cc protoc_middleman
> pkg-config --cflags protobuf # fails if protobuf is not installed
> -- c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
> -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
> +- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
> ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
>
> add_person_dart: add_person.dart protoc_middleman_dart
>
> ---
> -2.34.1
> +--
> +2.25.1
>
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
> similarity index 98%
> rename from meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
> rename to meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
> index a470a7c643..f899a1dc07 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.30.0.bb
> @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = " \
> DEPENDS = "zlib abseil-cpp jsoncpp"
> DEPENDS:append:class-target = " protobuf-native"
>
> -SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014"
> +SRCREV = "d295af5c3002c08e1bfd9d7f9e175d0a4d015f1e"
>
> -SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
> +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=30.x;protocol=https \
> file://run-ptest \
> file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
> "
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#115846):https://lists.openembedded.org/g/openembedded-devel/message/115846
> Mute This Topic:https://lists.openembedded.org/mt/111636013/7283133
> Group Owner:openembedded-devel+owner@lists.openembedded.org
> Unsubscribe:https://lists.openembedded.org/g/openembedded-devel/unsub [yi.zhao@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 10134 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0
2025-03-11 7:40 ` [oe] [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Yi Zhao
@ 2025-03-11 8:42 ` hongxu
0 siblings, 0 replies; 4+ messages in thread
From: hongxu @ 2025-03-11 8:42 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 130 bytes --]
On Tue, Mar 11, 2025 at 12:40 AM, Yi Zhao wrote:
>
> gold linker support
Sent V2 to drop gold linker support
//Hongxu
[-- Attachment #2: Type: text/html, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-11 8:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-11 7:35 [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Hongxu Jia
2025-03-11 7:35 ` [meta-oe][PATCH 2/2] xmlrpc-c: 1.60.03 -> 1.64.0 Hongxu Jia
2025-03-11 7:40 ` [oe] [meta-oe][PATCH 1/2] protobuf: 4.25.5 -> 4.30.0 Yi Zhao
2025-03-11 8:42 ` hongxu
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.