From nobody Tue Oct 15 00:05:59 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XSDs40K2Yz5ZNNr; Tue, 15 Oct 2024 00:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSDs36xTWz49xs; Tue, 15 Oct 2024 00:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728950760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXgS+TtFpJncUDCoJUAnJhvKwjWGTpr64tB0xS5t8Ps=; b=guwAsdNf0YbcDvrDn0PeUBeTA1RFWDBxTgydbf1h+1n/t5AuUQGih0g4g9JVALrILiFLog P8nZY5GXYw5wH/UMZjK75OTfqGuB2/X4jn7/7CubP86EAu2DYQN3MFR4eQmCPZsH+pXtY0 mRlS8AAbow4OxfADIpSHS0aPkOfy5IuGsatEXGRLE82V7BZlISmXDMISTYuKThOKF+1LzW rePiJgr8pnu89OzugjDeUyr/SLxLkA4DLtCy265mNMZ9rFhtuqrS4oAppI0g5p94z+hctr Ezi1a2ay7YM+1sK/hEMz+eDMsfJGYy+4aMeA7P3aNc4lcR19SxKLwY2o/Y5+Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728950760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXgS+TtFpJncUDCoJUAnJhvKwjWGTpr64tB0xS5t8Ps=; b=vvIVp4npEjmMkx9teUcOBuMVzETdV3m/g2AMaGBwolvOPL9trV9m5LQBrl3j+UU/Tcwnyf C1/K3Y8y/W4WhUV7KUj5SHTFbMjNpE2AFrAGBDKsEWTbEq6rtYcEmd5yB9nMu8OFmoa8P2 ejGqN/D87vFBqWXsyeyNbKhAwxUhUlwhfcEpsyj2SddA2GLLDASQLJxz8OcO8e3/Zr1vgO tNxlsUb5E65QDyvVGUB231wpfLeZmZAfhMMffm5eo2AVfOBgG/rz4obJqYhail/QzFiqeB 8l8ri3FvCMkFwGCdebUXhnzgGh44TPvuhMzL2+uxrNMQESTJjB9LbVX5DASHgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728950760; a=rsa-sha256; cv=none; b=JQ3LqE6I5fVakWdCcupBMtWyvJpeKomN4vqIKh5bFH1WY/43a84Y/AQ53yb22C9EIz9wNC Vkufot6qlBOhOAGM5dQncATntR+FDkzGv03K8Dalb6O8Y3rKfwYE6grqOHCY3XBn75rddv 8joXaxoOkwCnaBl4Bm+NsR6A9yio5flmTx5NcNL3/Rwd6uS77mFyPaP5nPmXW984BaONM7 A5kZuWNduUhYe/8kdfME14EiGwLr5bhi3x5WdYOI4HKu+9IwpTrU1G/ciYyZeZxDDNU/4W VHaZ3kyujEfeSqA514F3EZwC7omAyE7ylCQJ3rQ5BudP144i8s+nJEUHYFkEtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XSDs36Xwmz100H; Tue, 15 Oct 2024 00:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49F05xx6061400; Tue, 15 Oct 2024 00:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49F05xZh061397; Tue, 15 Oct 2024 00:05:59 GMT (envelope-from git) Date: Tue, 15 Oct 2024 00:05:59 GMT Message-Id: <202410150005.49F05xZh061397@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f04fa9eb992c - main - databases/duckdb: Fix runtime crashes by removing the jemalloc extension; Fix options handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f04fa9eb992cf7677ac075f59044b969b6e8eb2e Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f04fa9eb992cf7677ac075f59044b969b6e8eb2e commit f04fa9eb992cf7677ac075f59044b969b6e8eb2e Author: Yuri Victorovich AuthorDate: 2024-10-15 00:04:55 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-15 00:05:57 +0000 databases/duckdb: Fix runtime crashes by removing the jemalloc extension; Fix options handling --- databases/duckdb/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/databases/duckdb/Makefile b/databases/duckdb/Makefile index 34e89f24f836..a01bbc0ac03d 100644 --- a/databases/duckdb/Makefile +++ b/databases/duckdb/Makefile @@ -1,6 +1,7 @@ PORTNAME= duckdb DISTVERSIONPREFIX= v DISTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org @@ -33,7 +34,7 @@ BINARY_ALIAS= git=false OPTIONS_DEFINE= TPCE OPTIONS_DEFAULT= TPCE OPTIONS_GROUP= EXTENSIONS -OPTIONS_GROUP_EXTENSIONS= AUTOCOMPLETE FTS HTTPFS ICU INET JEMALLOC JSON PARQUET SQLSMITH TPCDS TPCH \ +OPTIONS_GROUP_EXTENSIONS= AUTOCOMPLETE FTS HTTPFS ICU INET JSON PARQUET SQLSMITH TPCDS TPCH \ SQLITE_SCANNER EXTENSIONS_DESC= Extensions: @@ -43,20 +44,24 @@ EXTENSIONS_DESC= Extensions: OPTIONS_DEFAULT+= ${opt} . endif ${opt}_DESC= Build the ${opt} extension -DUCKDB_EXTENSIONS+= ;${opt:tl} -${opt}_PLIST_FILES= lib/lib${opt:tl}_extension.a +DUCKDB_EXTENSIONS+= ${PORT_OPTIONS:M${opt}:S/${opt}/;${opt:tl}/} +${opt}_PLIST_FILES= ${PORT_OPTIONS:M${opt}:S/${opt}/lib\/lib${opt:tl}_extension.a/} .endfor 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} +CMAKE_ARGS+= -DSKIP_EXTENSIONS=jemalloc # temporary? see https://github.com/duckdb/duckdb/issues/14363#issuecomment-2412095766 SQLITE_SCANNER_CXXFLAGS= -I${WRKSRC}/extension/sqlite_scanner/src/include # workaround for the header not being found TPCE_DESC= Enable building of the TPC-E tool TPCE_CMAKE_BOOL= BUILD_TPCE +post-extract: # remove the jemalloc extension directory just in case + @${RM} -r ${WRKSRC}/extension/jemalloc + post-test: # run tests @cd ${TEST_WRKSRC} && test/unittest