mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] protobuf: version bump 33.0 -> 36.2
@ 2026-09-23 13:32 Sven Püschel
  2026-10-06  7:01 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2026-09-23 13:32 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

The patch isn't necessary anymore as upstream has a similar patch [1].

As the host protoc binary we need also requires the libprotobuf library,
we also have to enable the library there.

[1] https://github.com/protocolbuffers/protobuf/commit/e9efe030ad31fc8a6ae6baca258260e8f3426778

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 ...ix-building-when-libatomic-is-needed.patch | 36 -------------------
 patches/protobuf-33.0/series                  |  4 ---
 rules/host-protobuf.make                      |  1 +
 rules/protobuf.make                           |  5 +--
 4 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 patches/protobuf-33.0/0001-Fix-building-when-libatomic-is-needed.patch
 delete mode 100644 patches/protobuf-33.0/series

diff --git a/patches/protobuf-33.0/0001-Fix-building-when-libatomic-is-needed.patch b/patches/protobuf-33.0/0001-Fix-building-when-libatomic-is-needed.patch
deleted file mode 100644
index a6a0fd4d8..000000000
--- a/patches/protobuf-33.0/0001-Fix-building-when-libatomic-is-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 1 Nov 2025 09:58:09 +0100
-Subject: [PATCH] Fix building when libatomic is needed
-
-Set target_link_libraries for the correct target, the function argument,
-not always libprotobuf.
-
-Without this building for architectures that need libatomic fails with:
-
--- Performing Test protobuf_HAVE_BUILTIN_ATOMICS
--- Performing Test protobuf_HAVE_BUILTIN_ATOMICS - Failed
-CMake Error at cmake/protobuf-configure-target.cmake:11 (target_link_libraries):
-Cannot specify link libraries for target "libprotobuf" which is not built
-by this project.
-Call Stack (most recent call first):
-cmake/libprotobuf-lite.cmake:28 (protobuf_configure_target)
-CMakeLists.txt:278 (include)
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- cmake/protobuf-configure-target.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/protobuf-configure-target.cmake b/cmake/protobuf-configure-target.cmake
-index c67c57056591..425a5afdcd3f 100644
---- a/cmake/protobuf-configure-target.cmake
-+++ b/cmake/protobuf-configure-target.cmake
-@@ -8,7 +8,7 @@
- # Refactors configuration options set on all Protobuf targets
- function(protobuf_configure_target target)
-     if(protobuf_LINK_LIBATOMIC)
--        target_link_libraries(libprotobuf PRIVATE atomic)
-+        target_link_libraries("${target}" PRIVATE atomic)
-     endif()
- 
-     target_compile_features("${target}" PUBLIC cxx_std_17)
diff --git a/patches/protobuf-33.0/series b/patches/protobuf-33.0/series
deleted file mode 100644
index 213c99846..000000000
--- a/patches/protobuf-33.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-building-when-libatomic-is-needed.patch
-# 01d9eb118dc3af3da20ecb3e493d0757  - git-ptx-patches magic
diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
index 7a205018f..1a075d11c 100644
--- a/rules/host-protobuf.make
+++ b/rules/host-protobuf.make
@@ -20,6 +20,7 @@ HOST_PROTOBUF_CONF_OPT	:= \
 	$(HOST_CMAKE_OPT) \
 	-Dprotobuf_BUILD_CONFORMANCE=OFF \
 	-Dprotobuf_BUILD_EXAMPLES=OFF \
+	-Dprotobuf_BUILD_LIBPROTOBUF=ON \
 	-Dprotobuf_BUILD_LIBPROTOC=OFF \
 	-Dprotobuf_BUILD_LIBUPB=ON \
 	-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
diff --git a/rules/protobuf.make b/rules/protobuf.make
index 4abf7c284..639768db6 100644
--- a/rules/protobuf.make
+++ b/rules/protobuf.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
 #
 # Paths and names
 #
-PROTOBUF_VERSION	:= 33.0
-PROTOBUF_SHA256		:= cbc536064706b628dcfe507bef386ef3e2214d563657612296f1781aa155ee07
+PROTOBUF_VERSION	:= 36.2
+PROTOBUF_SHA256		:= 3d9642a662d10e68ebae5e53f14dcce5105684212d5078f8e0d47d1ab3ae6b64
 PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
 PROTOBUF_SUFFIX		:= tar.gz
 PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
@@ -34,6 +34,7 @@ PROTOBUF_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-Dprotobuf_BUILD_CONFORMANCE=OFF \
 	-Dprotobuf_BUILD_EXAMPLES=OFF \
+	-Dprotobuf_BUILD_LIBPROTOBUF=ON \
 	-Dprotobuf_BUILD_LIBPROTOC=OFF \
 	-Dprotobuf_BUILD_LIBUPB=OFF \
 	-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
-- 
2.47.3




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-10-06  7:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23 13:32 [ptxdist] [PATCH] protobuf: version bump 33.0 -> 36.2 Sven Püschel
2026-10-06  7:01 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox