From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A580158089 for ; Tue, 7 Nov 2023 18:50:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36FD12BC022; Tue, 7 Nov 2023 18:50:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id 20C7A2BC022 for ; Tue, 7 Nov 2023 18:50:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 656A8335D1B for ; Tue, 7 Nov 2023 18:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71CBC1331 for ; Tue, 7 Nov 2023 18:50:17 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1699383012.de122ee20e5f4b74dd53fbe68fcc25de0de8dbe3.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/, sci-mathematics/opensmt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch sci-mathematics/opensmt/opensmt-2.5.2.ebuild X-VCS-Directories: sci-mathematics/opensmt/files/ sci-mathematics/opensmt/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: de122ee20e5f4b74dd53fbe68fcc25de0de8dbe3 X-VCS-Branch: master Date: Tue, 7 Nov 2023 18:50:17 +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: e7b59fcd-af25-4eb3-b44f-13be16db1e8e X-Archives-Hash: 9f49a12f8f7cf1034a6ddabed8cfc264 commit: de122ee20e5f4b74dd53fbe68fcc25de0de8dbe3 Author: Kostadin Shishmanov tutanota com> AuthorDate: Tue Nov 7 17:45:28 2023 +0000 Commit: Maciej Barć gentoo org> CommitDate: Tue Nov 7 18:50:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de122ee2 sci-mathematics/opensmt: fix build with gcc 14 Closes: https://bugs.gentoo.org/916855 Signed-off-by: Kostadin Shishmanov tutanota.com> Closes: https://github.com/gentoo/gentoo/pull/33708 Signed-off-by: Maciej Barć gentoo.org> .../opensmt/files/opensmt-2.5.2-gcc-14.patch | 68 ++++++++++++++++++++++ sci-mathematics/opensmt/opensmt-2.5.2.ebuild | 4 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch b/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch new file mode 100644 index 000000000000..c5957641fff7 --- /dev/null +++ b/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch @@ -0,0 +1,68 @@ +From f30e983f876df3bd34571f9d554b3ebe226dd4bd Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov +Date: Tue, 7 Nov 2023 16:38:39 +0200 +Subject: [PATCH] Add include to fix building with gcc 14 + +Gentoo bug: +https://bugs.gentoo.org/916855 + +Upstream PR: +https://github.com/usi-verification-and-security/opensmt/pull/653 + +Signed-off-by: Kostadin Shishmanov +--- + src/logics/Logic.cc | 1 + + src/pterms/PtStore.cc | 1 + + src/simplifiers/BoolRewriting.cc | 1 + + src/tsolvers/egraph/EnodeStore.cc | 2 ++ + 4 files changed, 5 insertions(+) + +diff --git a/src/logics/Logic.cc b/src/logics/Logic.cc +index 2619df1fd..84b04d515 100644 +--- a/src/logics/Logic.cc ++++ b/src/logics/Logic.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff --git a/src/pterms/PtStore.cc b/src/pterms/PtStore.cc +index 377642947..63c6f56f3 100644 +--- a/src/pterms/PtStore.cc ++++ b/src/pterms/PtStore.cc +@@ -29,6 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #include "OsmtApiException.h" + + #include ++#include + + const int PtStore::ptstore_vec_idx = 1; + const int PtStore::ptstore_buf_idx = 2; +diff --git a/src/simplifiers/BoolRewriting.cc b/src/simplifiers/BoolRewriting.cc +index e2aa52b2c..196a642c4 100644 +--- a/src/simplifiers/BoolRewriting.cc ++++ b/src/simplifiers/BoolRewriting.cc +@@ -5,6 +5,7 @@ + #include "BoolRewriting.h" + #include "Logic.h" + #include ++#include + + // Replace subtrees consisting only of ands / ors with a single and / or term. + // Search a maximal section of the tree consisting solely of ands / ors. The +diff --git a/src/tsolvers/egraph/EnodeStore.cc b/src/tsolvers/egraph/EnodeStore.cc +index 2bed3302b..de2216410 100644 +--- a/src/tsolvers/egraph/EnodeStore.cc ++++ b/src/tsolvers/egraph/EnodeStore.cc +@@ -28,6 +28,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #include "Symbol.h" + #include "Logic.h" + ++#include ++ + EnodeStore::EnodeStore(Logic& l) + : logic(l) + , ea(1024*1024) diff --git a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild index 04e39c2ae269..73c64f7b50df 100644 --- a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild +++ b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild @@ -36,7 +36,9 @@ BDEPEND=" test? ( dev-cpp/gtest ) " -# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch ) +PATCHES=( + "${FILESDIR}/${PN}-2.5.2-gcc-14.patch" +) src_prepare() { cmake_src_prepare