Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jun 2024 08:49:06 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 917337a00901 - main - math/boolector: Fix tests (except one hanging test)
Message-ID:  <202406060849.4568n6FI002884@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=917337a0090162ff81663ef364b3c2cf68f65561

commit 917337a0090162ff81663ef364b3c2cf68f65561
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-06 05:12:09 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-06 08:48:58 +0000

    math/boolector: Fix tests (except one hanging test)
---
 math/boolector/Makefile                   |  8 ++++++--
 math/boolector/files/patch-CMakeLists.txt | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/math/boolector/Makefile b/math/boolector/Makefile
index 0d69f8ae44fe..6050ef0b1202 100644
--- a/math/boolector/Makefile
+++ b/math/boolector/Makefile
@@ -19,17 +19,21 @@ LIB_DEPENDS=	libbtor2parser.so:math/btor2tools \
 		libgmp.so:math/gmp
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		cmake:noninja,testing compiler:c++11-lang cpe python:test # ninja fails to build tests
+USES=		cmake:noninja,testing compiler:c++11-lang cpe python:test shebangfix
 
 CPE_VENDOR=	boolector_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Boolector
 
+SHEBANG_GLOB=	*.sh
+
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		USE_GMP
 CMAKE_OFF=	TESTING
-CMAKE_TESTING_ON=	TESTING # tests fail to comile, see https://github.com/Boolector/boolector/issues/216
+CMAKE_TESTING_ON=	TESTING # 1 test hangs, see https://github.com/Boolector/boolector/issues/227
 CMAKE_ARGS=	-DCaDiCaL_INCLUDE_DIR=${LOCALBASE}/include
 
+BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
+
 .include <bsd.port.mk>
diff --git a/math/boolector/files/patch-CMakeLists.txt b/math/boolector/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..c36c496feea3
--- /dev/null
+++ b/math/boolector/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+- workaround for https://github.com/Boolector/boolector/issues/226
+
+--- CMakeLists.txt.orig	2024-06-06 01:55:51 UTC
++++ CMakeLists.txt
+@@ -196,7 +196,7 @@ add_required_c_flag("-std=gnu99")
+ #       btorconfig.h and they are else not yet added to CMAKE_C(XX)_FLAGS at
+ #       file generation time (configure_file).
+ add_required_c_flag("-std=gnu99")
+-add_required_cxx_flag("-std=gnu++11")
++add_required_cxx_flag("-std=gnu++14")
+ 
+ add_check_c_cxx_flag("-W")
+ add_check_c_cxx_flag("-Wall")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406060849.4568n6FI002884>