diff --git a/math/bitwuzla/Makefile b/math/bitwuzla/Makefile index aecc4a302cd4..2a9354538866 100644 --- a/math/bitwuzla/Makefile +++ b/math/bitwuzla/Makefile @@ -1,33 +1,35 @@ PORTNAME= bitwuzla -DISTVERSION= 0.5.0 +DISTVERSION= 0.7.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= SMT solver for the theories of fixed-size bit-vectors WWW= https://bitwuzla.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gmp>0:math/gmp \ ${LOCALBASE}/lib/symfpu.a:math/symfpu LIB_DEPENDS= libcadical.so:math/cadical \ libgmp.so:math/gmp TEST_DEPENDS= googletest>0:devel/googletest USES= compiler:c++17-lang localbase:ldflags meson pkgconfig python:build USE_GITHUB= yes USE_LDCONFIG= yes LDFLAGS+= -lcadical MESON_ARGS= -Ddefault_library=shared \ -Dtesting=disabled +BINARY_ALIAS= git=false + do-test: # 1 test hangs, see https://github.com/bitwuzla/bitwuzla/issues/117 @cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} -Dtesting=enabled && \ cd ${BUILD_WRKSRC} && \ ${DO_MAKE_BUILD} test .include diff --git a/math/bitwuzla/distinfo b/math/bitwuzla/distinfo index ea385f26ab87..0d2a29406740 100644 --- a/math/bitwuzla/distinfo +++ b/math/bitwuzla/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1717606902 -SHA256 (rel-1.7.4.tar.gz) = 866c8a1332ff1ad5dc7ad403bdef3164420f3f947816b5c9509aad1d18ada7a1 -SIZE (rel-1.7.4.tar.gz) = 647830 -SHA256 (bitwuzla-bitwuzla-0.5.0_GH0.tar.gz) = a477a5973883a8c174ffca8174cd7493a4aae6c95c72397628d395c32226392b -SIZE (bitwuzla-bitwuzla-0.5.0_GH0.tar.gz) = 2010240 +TIMESTAMP = 1734064151 +SHA256 (bitwuzla-bitwuzla-0.7.0_GH0.tar.gz) = 4a388aa935fab5fe3e61494f94c1110653ac11e07f1cf29593d6fdba30238afa +SIZE (bitwuzla-bitwuzla-0.7.0_GH0.tar.gz) = 2071988 diff --git a/math/bitwuzla/files/patch-src_meson.build b/math/bitwuzla/files/patch-src_meson.build index 43c57c11408e..0220847c7c2c 100644 --- a/math/bitwuzla/files/patch-src_meson.build +++ b/math/bitwuzla/files/patch-src_meson.build @@ -1,35 +1,35 @@ ---- src/meson.build.orig 2024-05-29 23:47:56 UTC +--- src/meson.build.orig 2024-12-13 03:01:05 UTC +++ src/meson.build @@ -15,13 +15,13 @@ gmp_dep = dependency('gmp', # Subproject dependencies # CaDiCaL does not provide pkg-config to find dependency -cadical_dep = cpp_compiler.find_library('cadical', - has_headers: 'cadical.hpp', - static: build_static, - required: false) -if not cadical_dep.found() - cadical_dep = dependency('cadical', required: true) -endif +#cadical_dep = cpp_compiler.find_library('cadical', +# has_headers: 'cadical.hpp', +# static: build_static, +# required: false) +#if not cadical_dep.found() +# cadical_dep = dependency('cadical', required: true) +#endif - # Kissat does not provide pkg-config to find dependency - kissat_dep = cpp_compiler.find_library('kissat', -@@ -34,9 +34,9 @@ endif + cms_dep = dependency('cryptominisat5', + version: '5.11.21', +@@ -39,9 +39,9 @@ endif # Using system include type suppresses compile warnings originating from the # symfpu headers -symfpu_dep = dependency('symfpu', include_type: 'system', required: true) +#symfpu_dep = dependency('symfpu', include_type: 'system', required: true) --dependencies = [symfpu_dep, cadical_dep, kissat_dep, gmp_dep] -+dependencies = [kissat_dep, gmp_dep] +-dependencies = [symfpu_dep, cadical_dep, cms_dep, kissat_dep, gmp_dep] ++dependencies = [cms_dep, kissat_dep, gmp_dep] cpp_args = [] - if kissat_dep.found() + if cms_dep.found()