From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1BBA1580EB for ; Fri, 23 May 2025 22:20:50 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AB6F23436F9 for ; Fri, 23 May 2025 22:20:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C562811047D; Fri, 23 May 2025 22:20:47 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BF81011047D for ; Fri, 23 May 2025 22:20:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E9643436E6 for ; Fri, 23 May 2025 22:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5A3319E5 for ; Fri, 23 May 2025 22:20:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1748038810.ebcbaf61d4b7bdb2113bb00294031a79e8d4fad2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/thrift/, dev-libs/thrift/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/thrift/files/thrift-0.21.0-cmake4.patch dev-libs/thrift/thrift-0.21.0-r1.ebuild X-VCS-Directories: dev-libs/thrift/ dev-libs/thrift/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ebcbaf61d4b7bdb2113bb00294031a79e8d4fad2 X-VCS-Branch: master Date: Fri, 23 May 2025 22:20:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15bd4204-6238-4d84-995d-7cf3ff073df4 X-Archives-Hash: fea458d0d0b0ed6d737f56373089f782 commit: ebcbaf61d4b7bdb2113bb00294031a79e8d4fad2 Author: Kostadin Shishmanov protonmail com> AuthorDate: Fri May 23 20:33:16 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 23 22:20:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcbaf61 dev-libs/thrift: fix build with cmake 4 Closes: https://bugs.gentoo.org/951678 Signed-off-by: Kostadin Shishmanov protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42230 Closes: https://github.com/gentoo/gentoo/pull/42230 Signed-off-by: Sam James gentoo.org> dev-libs/thrift/files/thrift-0.21.0-cmake4.patch | 54 +++++++++++++++++ dev-libs/thrift/thrift-0.21.0-r1.ebuild | 74 ++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dev-libs/thrift/files/thrift-0.21.0-cmake4.patch b/dev-libs/thrift/files/thrift-0.21.0-cmake4.patch new file mode 100644 index 000000000000..f8bcc7865b2e --- /dev/null +++ b/dev-libs/thrift/files/thrift-0.21.0-cmake4.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/951678 +https://github.com/apache/thrift/commit/b3fc4b2 + +From b3fc4b224258e4bf154bf774746f0d2554edb90c Mon Sep 17 00:00:00 2001 +From: Vyas Ramasubramani +Date: Sun, 20 Apr 2025 13:57:06 -0700 +Subject: [PATCH] Update minimum required CMake version for CMake 4.0 + compatibility + +--- + CMakeLists.txt | 2 +- + compiler/cpp/CMakeLists.txt | 2 +- + compiler/cpp/tests/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b76d7035b22..1f74e75c5f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ + # under the License. + # + +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.16) + + if(POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) # package version behavior added in cmake 3.0 +diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt +index b0f123555d8..4c1c2c56a55 100644 +--- a/compiler/cpp/CMakeLists.txt ++++ b/compiler/cpp/CMakeLists.txt +@@ -17,7 +17,7 @@ + # under the License. + # + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.16) + project("thrift-compiler" VERSION ${PACKAGE_VERSION}) + + # version.h now handled via veralign.sh +diff --git a/compiler/cpp/tests/CMakeLists.txt b/compiler/cpp/tests/CMakeLists.txt +index d9c5209134c..6a078ec6304 100644 +--- a/compiler/cpp/tests/CMakeLists.txt ++++ b/compiler/cpp/tests/CMakeLists.txt +@@ -16,7 +16,7 @@ + # specific language governing permissions and limitations + # under the License. + # +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.16) + + project(thrift_compiler_tests) + diff --git a/dev-libs/thrift/thrift-0.21.0-r1.ebuild b/dev-libs/thrift/thrift-0.21.0-r1.ebuild new file mode 100644 index 000000000000..9632d2ddbe0b --- /dev/null +++ b/dev-libs/thrift/thrift-0.21.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ bindings for Apache Thrift" +HOMEPAGE="https://thrift.apache.org/lib/cpp.html" +# Misses testing files +# SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz" +SRC_URI=" + https://github.com/apache/thrift/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~x86" + +IUSE="libevent lua +ssl test" +REQUIRED_USE="test? ( ssl libevent )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:=[nls(+)] + dev-libs/openssl:= + sys-libs/zlib:= + libevent? ( dev-libs/libevent:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +PATCHES=( + "${FILESDIR}/thrift-0.21.0-gcc15-cstdint.patch" + "${FILESDIR}/thrift-0.21.0-cmake4.patch" +) + +src_configure() { + local mycmakeargs=( + # follow order in build/cmake/DefineOptions.cmake + # Prefer WITH_OPTION over BUILD_OPTION for bug #943012 + -DBUILD_COMPILER=ON + -DBUILD_TESTING=$(usex test) + -DBUILD_TUTORIALS=OFF + -DBUILD_LIBRARIES=ON + -DWITH_AS3=ON + -DWITH_CPP=ON + -DWITH_ZLIB=ON + -DWITH_LIBEVENT=$(usex libevent) + -DWITH_QT5=OFF + -DWITH_C_GLIB=OFF + -DWITH_OPENSSL=$(usex ssl) + -DWITH_JAVA=OFF + -DWITH_JAVASCRIPT=OFF + -DWITH_NODEJS=OFF + -DWITH_PYTHON=OFF + -Wno-dev + ) + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # network sandbox + StressTestConcurrent + StressTestNonBlocking + UnitTests + ) + cmake_src_test +}