From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Oct 2026 09:01:59 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xDzBX-00AOvi-2C for lore@lore.pengutronix.de; Tue, 06 Oct 2026 09:01:59 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzBV-0001yw-AQ; Tue, 06 Oct 2026 09:01:57 +0200 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzB0-0000Qn-Pq for ptxdist@pengutronix.de; Tue, 06 Oct 2026 09:01:27 +0200 Received: from dude05.red.stw.pengutronix.de (dude05.red.stw.4.pengutronix.de [10.17.1.19]) (Authenticated sender: relay-from-dude05.red.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id B804D2012A4; Tue, 06 Oct 2026 09:01:26 +0200 (CEST) ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1791270086; a=rsa-sha256; cv=none; b=I5y/bbc0p+dAV/VdpaaEmC/jQhZfMVXsqnAuGdvW7LFSTewb8R5fiepZww7I+vgZba19Zv YDm1lW+eojpZRWmUDoCn2z3B5Rycug7UIZYyFkcfjgdVp0SaZ4UIirdfRZYlFgjO8OJ3HV ycP2DqJ/VPqO8kshtcX7zhgCY9TwFY64FCUGBcDvpd8tJRgSLEhXrFualpl6QPrGxSHmaH zcw4YEBxmo/VOOOOsh8uFF/4OGu7leyWi2FGMAQUwbQWWkUBOIGMydcG7TrdAoF7fzEIgC 8fb6uUzM/6GiexmmbeyUv+LMBO+8nE8gcgLJv3LbwgoSh4i+FRW1zOowTUDI7w== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=relay-from-dude05.red.stw.pengutronix.de smtp.mailfrom=mol@pengutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1791270086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6ZTFJPeCYL2ZrkWwQAwtHX7fPL2GE1jbyIvsP1IKrM4=; b=Xu3HxTuj8cUsiTLK5PvqmImCg4P2p9zxaB7sk7HOsPwSLfiljHDY+4/bqdF/f6/4kydd84 2Dss4rKMAKIAWR0cD615pfwn4XV7OUZhhUQ6QG7Lqzr7CyC6vEohIPsSXkuXBOTJx+k3cw JnHl2E/wna4qYuAyneSnBdpnsIFhIyAp4yZjfWulQrYmkJBbXB+rCqdSPw2nKhfGrdlK4b 5rDm3thTBqkxc0vNnsOq6MgOBDNh1PtClmmfCTFNkghRhnD4HilQcOjoSDbj/PKR5IsLcx /E7NdUZeBVBLZJSp0ZWQsFG8Hz3Lr0mbbNxXMrlai2uOzSH2R//4C1s/r5TX5A== Received: by dude05.red.stw.pengutronix.de (Postfix, from userid 1014) id A924E742505; Tue, 06 Oct 2026 09:01:26 +0200 (CEST) From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 6 Oct 2026 09:01:26 +0200 Message-ID: <20261006070126.2792410-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260923133228.3178396-1-s.pueschel@pengutronix.de> References: <20260923133228.3178396-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [APPLIED] protobuf: version bump 33.0 -> 36.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 8751f2ae3166094d62b975aa386e8da97c2a8e76. Michael [sent from post-receive hook] On Tue, 06 Oct 2026 09:01:26 +0200, Sven Püschel wrote: > 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 > Message-Id: <20260923133228.3178396-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 a6a0fd4d866e..000000000000 > --- a/patches/protobuf-33.0/0001-Fix-building-when-libatomic-is-needed.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From: Michael Olbrich > -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 > ---- > - 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 213c99846744..000000000000 > --- 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 7a205018f1ad..1a075d11ce82 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 4abf7c284a59..639768db69c3 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 \