databases/postgresql-promscale: Update to 0.8.0

Changelog:	https://github.com/timescale/promscale_extension/releases/tag/0.8.0

PR:	267851
This commit is contained in:
Mark Felder
2023-01-25 17:00:46 +00:00
parent b14372aa3a
commit 880ce9772b
7 changed files with 479 additions and 443 deletions
+10 -19
View File
@@ -1,6 +1,6 @@
PORTNAME= promscale
PORTVERSION= 0.7.0
PORTREVISION= 3
PORTVERSION= 0.8.0
PORTREVISION= 0
CATEGORIES= databases
PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}-
@@ -11,22 +11,16 @@ WWW= https://www.timescale.com/promscale
LICENSE= PostgreSQL
ONLY_FOR_ARCHS= aarch64 amd64
BROKEN= fails to build using Rust 1.65.0 or newer, PR 267851
RUN_DEPENDS= timescaledb>0:databases/timescaledb
RUN_DEPENDS= timescaledb>=2.9.1:databases/timescaledb
BUILD_DEPENDS= bash>0:shells/bash
USES= cargo gmake pgsql:12+
# Depends on an unpublished crate. Can't use cargo.mk to fetch it.
PGX_REV= 96ece243
DISTFILES+= pgx-${PGX_REV}.tar.gz
SITES.pgx-${PGX_REV}.tar.gz+= ${MASTER_SITE_GITHUB:=timescale/}pgx/archive/${PGX_REV}.tar.gz
USE_GITHUB= yes
GH_ACCOUNT= timescale timescale:pgx
GH_PROJECT= promscale_extension pgx:pgx
GH_TAGNAME= ${PORTVERSION} 96ece243:pgx
GH_ACCOUNT= timescale
GH_PROJECT= promscale_extension
GH_TAGNAME= ${PORTVERSION}
WANT_PGSQL= server
@@ -35,15 +29,12 @@ MAKE_ENV+= MAKE=gmake PATH=${PATH}:${WRKDIR}/.cargo/bin
.include "${.CURDIR}/crates.mk"
post-extract:
${MV} ${WRKDIR}/pgx-* ${WRKDIR}/pgx
pre-configure:
@${PATCH} -d ${WRKDIR} ${PATCH_ARGS} < ${PATCHDIR}/pgx-include-patch
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKDIR}/pgx/pgx-pg-sys/build.rs
post-patch:
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/cargo-crates/pgx-pg-sys-*/build.rs
pre-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} cargo install --offline --path ../pgx/cargo-pgx cargo-pgx
${RLN} ${WRKSRC}/cargo-crates/cargo-pgx-0.6.1 ${WRKDIR}/pgx
${SETENV} ${MAKE_ENV} cargo install --offline --path ${WRKDIR}/pgx cargo-pgx
${MKDIR} ${WRKDIR}/.pgx
${PRINTF} '[configs]\npg${PGSQL_VERSION}="${LOCALBASE}/bin/pg_config"\n' > ${WRKDIR}/.pgx/config.toml
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,15 +1,7 @@
--- Cargo.toml.orig 2022-11-02 15:28:07 UTC
--- Cargo.toml.orig 2023-01-05 17:41:15 UTC
+++ Cargo.toml
@@ -50,10 +50,10 @@ askama = "0.11.0"
pgx-tests = "0.4.5"
[patch.crates-io]
-pgx = { git = "https://github.com/timescale/pgx", rev = "96ece243" }
-pgx-macros = { git = "https://github.com/timescale/pgx", rev = "96ece243" }
-pgx-tests = { git = "https://github.com/timescale/pgx", rev = "96ece243" }
+pgx = { path = "../pgx/pgx" }
+pgx-macros = { path = "../pgx/pgx-macros" }
+pgx-tests = { path = "../pgx/pgx-tests" }
@@ -51,5 +51,5 @@ askama = "0.11.1"
pgx-tests = "0.6.1"
# from e2e workspace
-test-generator = { git = "https://github.com/JamesGuthrie/test-generator" }
@@ -0,0 +1,10 @@
--- cargo-crates/pgx-pg-sys-0.6.1/build.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/pgx-pg-sys-0.6.1/build.rs
@@ -566,6 +566,7 @@ fn run_bindgen(pg_config: &PgConfig, include_h: &PathB
let bindings = bindgen::Builder::default()
.header(include_h.display().to_string())
.clang_arg(&format!("-I{}", includedir_server.display()))
+ .clang_arg("-I/usr/local/include")
.clang_args(&extra_bindgen_clang_args(pg_config)?)
.parse_callbacks(Box::new(PgxOverrides::default()))
.blocklist_type("(Nullable)?Datum") // manually wrapping datum types for correctness
@@ -1,10 +0,0 @@
--- pgx/pgx-pg-sys/build.rs.orig 2022-11-06 21:01:34.720308000 +0000
+++ pgx/pgx-pg-sys/build.rs 2022-11-06 21:02:14.469075000 +0000
@@ -507,6 +507,7 @@
let bindings = bindgen::Builder::default()
.header(include_h.display().to_string())
.clang_arg(&format!("-I{}", includedir_server.display()))
+ .clang_arg("-I%%LOCALBASE%%/include")
.parse_callbacks(Box::new(IgnoredMacros::default()))
.blocklist_function("varsize_any") // pgx converts the VARSIZE_ANY macro, so we don't want to also have this function, which is in heaptuple.c
.blocklist_function("query_tree_walker")
+27 -18
View File
@@ -1,48 +1,57 @@
lib/postgresql/promscale-0.7.0.so
lib/postgresql/promscale-0.8.0.so
share/postgresql/extension/promscale.control
share/postgresql/extension/promscale--0.0.0.sql
share/postgresql/extension/promscale--0.0.0--0.5.0.sql
share/postgresql/extension/promscale--0.0.0--0.5.1.sql
share/postgresql/extension/promscale--0.0.0--0.5.2.sql
share/postgresql/extension/promscale--0.0.0--0.5.4.sql
share/postgresql/extension/promscale--0.0.0--0.6.0.sql
share/postgresql/extension/promscale--0.0.0--0.7.0.sql
share/postgresql/extension/promscale--0.0.0.sql
share/postgresql/extension/promscale--0.1--0.1.1.sql
share/postgresql/extension/promscale--0.1.1--0.1.2.sql
share/postgresql/extension/promscale--0.1.1.sql
share/postgresql/extension/promscale--0.1.2--0.1.3-beta.sql
share/postgresql/extension/promscale--0.1.2.sql
share/postgresql/extension/promscale--0.1.3-beta--0.2.0.sql
share/postgresql/extension/promscale--0.1.3-beta.sql
share/postgresql/extension/promscale--0.0.0--0.8.0.sql
share/postgresql/extension/promscale--0.1.sql
share/postgresql/extension/promscale--0.2.0--0.3.0.sql
share/postgresql/extension/promscale--0.1--0.1.1.sql
share/postgresql/extension/promscale--0.1.1.sql
share/postgresql/extension/promscale--0.1.1--0.1.2.sql
share/postgresql/extension/promscale--0.1.2.sql
share/postgresql/extension/promscale--0.1.2--0.1.3-beta.sql
share/postgresql/extension/promscale--0.1.3-beta.sql
share/postgresql/extension/promscale--0.1.3-beta--0.2.0.sql
share/postgresql/extension/promscale--0.2.0.sql
share/postgresql/extension/promscale--0.3.0--0.3.1.sql
share/postgresql/extension/promscale--0.2.0--0.3.0.sql
share/postgresql/extension/promscale--0.3.0.sql
share/postgresql/extension/promscale--0.3.1--0.3.2.sql
share/postgresql/extension/promscale--0.3.0--0.3.1.sql
share/postgresql/extension/promscale--0.3.1.sql
share/postgresql/extension/promscale--0.3.1--0.3.2.sql
share/postgresql/extension/promscale--0.3.2.sql
share/postgresql/extension/promscale--0.5.0.sql
share/postgresql/extension/promscale--0.5.0--0.5.1.sql
share/postgresql/extension/promscale--0.5.0--0.5.2.sql
share/postgresql/extension/promscale--0.5.0--0.5.4.sql
share/postgresql/extension/promscale--0.5.0--0.6.0.sql
share/postgresql/extension/promscale--0.5.0--0.7.0.sql
share/postgresql/extension/promscale--0.5.0.sql
share/postgresql/extension/promscale--0.5.0--0.8.0.sql
share/postgresql/extension/promscale--0.5.1.sql
share/postgresql/extension/promscale--0.5.1--0.5.2.sql
share/postgresql/extension/promscale--0.5.1--0.5.4.sql
share/postgresql/extension/promscale--0.5.1--0.6.0.sql
share/postgresql/extension/promscale--0.5.1--0.7.0.sql
share/postgresql/extension/promscale--0.5.1.sql
share/postgresql/extension/promscale--0.5.1--0.8.0.sql
share/postgresql/extension/promscale--0.5.2.sql
share/postgresql/extension/promscale--0.5.2--0.5.4.sql
share/postgresql/extension/promscale--0.5.2--0.6.0.sql
share/postgresql/extension/promscale--0.5.2--0.7.0.sql
share/postgresql/extension/promscale--0.5.2.sql
share/postgresql/extension/promscale--0.5.2--0.8.0.sql
share/postgresql/extension/promscale--0.5.3--0.5.4.sql
share/postgresql/extension/promscale--0.5.3--0.6.0.sql
share/postgresql/extension/promscale--0.5.3--0.7.0.sql
share/postgresql/extension/promscale--0.5.3--0.8.0.sql
share/postgresql/extension/promscale--0.5.4.sql
share/postgresql/extension/promscale--0.5.4--0.6.0.sql
share/postgresql/extension/promscale--0.5.4--0.7.0.sql
share/postgresql/extension/promscale--0.5.4.sql
share/postgresql/extension/promscale--0.6.0--0.7.0.sql
share/postgresql/extension/promscale--0.5.4--0.8.0.sql
share/postgresql/extension/promscale--0.6.0.sql
share/postgresql/extension/promscale--0.6.0--0.7.0.sql
share/postgresql/extension/promscale--0.6.0--0.8.0.sql
share/postgresql/extension/promscale--0.7.0.sql
share/postgresql/extension/promscale.control
share/postgresql/extension/promscale--0.7.0--0.8.0.sql
share/postgresql/extension/promscale--0.8.0.sql