Date: Fri, 19 Apr 2024 19:28:29 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: b6cd01e91204 - main - databases/duckdb: FIx most tests by correcting how OVERRIDE_GIT_DESCRIBE is passed to the build Message-ID: <202404191928.43JJSTkL071897@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=b6cd01e91204248e9c3a5b1e774db7bbe9908e38 commit b6cd01e91204248e9c3a5b1e774db7bbe9908e38 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-04-19 18:24:19 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-04-19 19:28:23 +0000 databases/duckdb: FIx most tests by correcting how OVERRIDE_GIT_DESCRIBE is passed to the build 2 tests still fail. --- databases/duckdb/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databases/duckdb/Makefile b/databases/duckdb/Makefile index d34b20af3bb4..abde3f96cb27 100644 --- a/databases/duckdb/Makefile +++ b/databases/duckdb/Makefile @@ -16,8 +16,8 @@ GH_TUPLE= duckdb:sqlite_scanner:091197e:sqlite/extension/sqlite_scanner CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_UNITTESTS -CMAKE_ARGS= -DOVERRIDE_GIT_DESCRIBE=v${DISTVERSION}-g00000000 -CMAKE_TESTING_ON= BUILD_UNITTESTS # 2 tests fail, see https://github.com/duckdb/duckdb/issues/10652 +CMAKE_ARGS= -DOVERRIDE_GIT_DESCRIBE=v${DISTVERSION}-0-g0000000000 +CMAKE_TESTING_ON= BUILD_UNITTESTS # 2 tests fail, see https://github.com/duckdb/duckdb/issues/11744 CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack: works as empty target BINARY_ALIAS= git=false @@ -39,7 +39,7 @@ DUCKDB_EXTENSIONS+= ;${opt:tl} ${opt}_PLIST_FILES= lib/lib${opt:tl}_extension.a .endfor -CMAKE_ARGS= -DBUILD_EXTENSIONS="${DUCKDB_EXTENSIONS:tW:S/ //g:S/^;//}" \ +CMAKE_ARGS+= -DBUILD_EXTENSIONS="${DUCKDB_EXTENSIONS:tW:S/ //g:S/^;//}" \ -DDUCKDB_MAJOR_VERSION=${PORTVERSION:R:R} \ -DDUCKDB_MINOR_VERSION=${PORTVERSION:R:E} \ -DDUCKDB_PATCH_VERSION=${PORTVERSION:E}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404191928.43JJSTkL071897>