From nobody Thu Nov 16 06:40:50 2023 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 4SW9Qp4yZzz51Fl9; Thu, 16 Nov 2023 06:40:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SW9Qp4CtZz3S36; Thu, 16 Nov 2023 06:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700116850; 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=nZ63WaJVwT5VZiVsaxuUebOrIho2P7kb9ZK76uHWdn0=; b=TDiFsIsON5S0csoc8UfmuO7ys6qHYq0FRgxfEWmb+vjhbWt4u/i20MsO6ygciuo40QOfNY Xp+ZpVp4JG0bObl9y67LVhGzaP10BLnw1LROwO54jBSaZ1AdvUmFdRFh+wQ8vRf4MLKmAi aQzlLDIxllsR8Ec0XSTLKchPYy1vj9F3RYdZzPUgzRSdrFIqpKLviyKo4/fQ1hN+owj1tw hKyMYiz25XC65r+KLxu3QsNC6p5k0OyDjroE3dhHk7GytWjg3nQjmZEMxqRSc/XvxW8cjL lSpNhL6iaQVFv0BnpO3jZbGL8tYth4H+/VT4VHZAKudtb8AHXqFk6XYJQtwTdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700116850; 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=nZ63WaJVwT5VZiVsaxuUebOrIho2P7kb9ZK76uHWdn0=; b=cwUGxlD/VophbAWKBJN99uj1NJ3gGaz+45bmx0+JNFoH3aMJAM/YPuB+o+aThC26icVIz5 Sf1BLLY5JHm7PHRaHR07/uboSWIsTfLIhGgXx2QomorOBp1phrMTDtTbHC12EhfjC3gSmT 0juUAWMb0dL1xY8nWv3GCJe4d6isMohZvT2dfv6RXsGQnvp+hmZ960O/n+x9DVKrktE8P5 OZoX6xVe4FrODFsiOmugLoR1qRL+WpIfJaW/K49V7IP7wPCA1PlwweUUt5JtYPqLk0jHJR aS0U8zQSAp2JizwRfWY3+VOZOTesO/WbnhwtK0oj8JmmoPUEnvi3QIyYvtPDsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700116850; a=rsa-sha256; cv=none; b=ikEmuTJ28Jg52uBZ/sOzhN1mhDJWtkLdT/cAPpjSF7svxcsN+zgD5FT+6h22feKrymuj+1 wJnLCOxUzAjf3itfYgLiiyIpH6sW8+vps0r7D5/wo3qjHoD1BEZ2x/Cwa1BXKSPzF9kwKc NDQ7CZ8CgBqaiux7/u3d7/AkZOFOax+sICeOrV+Q1kZnngEqT3y75FGoOUYG7Ibs6Sv51H FdBevIcdmcPDL5tFGs3vdxRFMEGNJlfST228U6+2Z6HrWzIvzdKNj3tT1a5Rw7s98QZgS5 DlXQ4l2PfYgo2mpYB9RwGifu2Gn17YeZTuHf6wEnqzj9RrjLIg+eQpwrmbc0WA== 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 4SW9Qp3GmmzqFR; Thu, 16 Nov 2023 06:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AG6eoTN026495; Thu, 16 Nov 2023 06:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AG6eomD026492; Thu, 16 Nov 2023 06:40:50 GMT (envelope-from git) Date: Thu, 16 Nov 2023 06:40:50 GMT Message-Id: <202311160640.3AG6eomD026492@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: a313aafb0ebc - main - databases/duckdb: Add pre-compiled sqlite extension; Fix version reported by DuckDB 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: a313aafb0ebc587ac25ba438a485a6f7d93282b7 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a313aafb0ebc587ac25ba438a485a6f7d93282b7 commit a313aafb0ebc587ac25ba438a485a6f7d93282b7 Author: Yuri Victorovich AuthorDate: 2023-11-16 06:37:35 +0000 Commit: Yuri Victorovich CommitDate: 2023-11-16 06:40:47 +0000 databases/duckdb: Add pre-compiled sqlite extension; Fix version reported by DuckDB Other extensions should be added as pre-compiled extensions the same way, because otherwise DuckDB attempts to download pre-compiled extensions as binaries which only works for Linux, and is also very insecure. --- databases/duckdb/Makefile | 12 ++++++++++-- databases/duckdb/distinfo | 4 +++- databases/duckdb/files/patch-CMakeLists.txt | 28 ++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/databases/duckdb/Makefile b/databases/duckdb/Makefile index 9105f595aa0e..4f4af8907571 100644 --- a/databases/duckdb/Makefile +++ b/databases/duckdb/Makefile @@ -1,6 +1,7 @@ PORTNAME= duckdb DISTVERSIONPREFIX= v DISTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org @@ -12,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++11-lang ssl USE_GITHUB= yes +GH_TUPLE= duckdb:sqlite_scanner:ef91604:sqlite/extension/sqlite_scanner CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_UNITTESTS @@ -23,7 +25,8 @@ BINARY_ALIAS= git=false OPTIONS_DEFINE= TPCE OPTIONS_DEFAULT= TPCE OPTIONS_GROUP= EXTENSIONS -OPTIONS_GROUP_EXTENSIONS= AUTOCOMPLETE EXCEL FTS HTTPFS ICU INET JEMALLOC JSON PARQUET SQLSMITH TPCDS TPCH VISUALIZER +OPTIONS_GROUP_EXTENSIONS= AUTOCOMPLETE EXCEL FTS HTTPFS ICU INET JEMALLOC JSON PARQUET SQLSMITH TPCDS TPCH VISUALIZER \ + SQLITE_SCANNER EXTENSIONS_DESC= Extensions: @@ -36,7 +39,12 @@ 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} + +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 diff --git a/databases/duckdb/distinfo b/databases/duckdb/distinfo index 00ba6c24c23e..aac9b3d196fd 100644 --- a/databases/duckdb/distinfo +++ b/databases/duckdb/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1700026259 +TIMESTAMP = 1700111325 SHA256 (duckdb-duckdb-v0.9.2_GH0.tar.gz) = afff7bd925a98dc2af4039b8ab2159b0705cbf5e0ee05d97f7bb8dce5f880dc2 SIZE (duckdb-duckdb-v0.9.2_GH0.tar.gz) = 75296956 +SHA256 (duckdb-sqlite_scanner-ef91604_GH0.tar.gz) = 935698a7fde1ec5b5dd94dfd0e02e89a331ca732f6c07add76307839382491cc +SIZE (duckdb-sqlite_scanner-ef91604_GH0.tar.gz) = 4648835 diff --git a/databases/duckdb/files/patch-CMakeLists.txt b/databases/duckdb/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a1cb950405d1 --- /dev/null +++ b/databases/duckdb/files/patch-CMakeLists.txt @@ -0,0 +1,28 @@ +--- CMakeLists.txt.orig 2023-11-13 18:58:24 UTC ++++ CMakeLists.txt +@@ -240,7 +240,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + endif() + + find_package(Git) +-if(Git_FOUND) ++if(FALSE AND Git_FOUND) + if (NOT DEFINED GIT_COMMIT_HASH) + execute_process( + COMMAND ${GIT_EXECUTABLE} log -1 --format=%h +@@ -279,11 +279,11 @@ if(GIT_RESULT EQUAL "0") + endif() + else() + # fallback for when building from tarball +- set(DUCKDB_MAJOR_VERSION 0) +- set(DUCKDB_MINOR_VERSION 0) +- set(DUCKDB_PATCH_VERSION 1) +- set(DUCKDB_DEV_ITERATION 0) +- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") ++ #set(DUCKDB_MAJOR_VERSION 0) ++ #set(DUCKDB_MINOR_VERSION 0) ++ #set(DUCKDB_PATCH_VERSION 1) ++ #set(DUCKDB_DEV_ITERATION 0) ++ set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}") + endif() + + message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")