CVS commit: pkgsrc/databases/postgresql-promscale_extension

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jul 18 22:14:25 UTC 2022

Modified Files:
        pkgsrc/databases/postgresql-promscale_extension: Makefile distinfo
Added Files:
        pkgsrc/databases/postgresql-promscale_extension/patches:
            patch-pgx_pgx-pg-sys_build.rs

Log Message:
postgresql-promscale_extension: fix include paths for bindgen


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/databases/postgresql-promscale_extension/Makefile
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/databases/postgresql-promscale_extension/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql-promscale_extension/patches/patch-pgx_pgx-pg-sys_build.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql-promscale_extension/Makefile
diff -u pkgsrc/databases/postgresql-promscale_extension/Makefile:1.14 pkgsrc/databases/postgresql-promscale_extension/Makefile:1.15
--- pkgsrc/databases/postgresql-promscale_extension/Makefile:1.14       Mon Jul 18 19:47:26 2022
+++ pkgsrc/databases/postgresql-promscale_extension/Makefile    Mon Jul 18 22:14:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/07/18 19:47:26 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2022/07/18 22:14:25 tnn Exp $
 
 DISTNAME=      promscale_extension-0.5.2
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
@@ -29,6 +29,12 @@ BUILD_TARGET=        package
 MAKE_FLAGS+=   PG_CONFIG=${PREFIX}/bin/pg_config
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 
+SUBST_CLASSES+=                        include_dir
+SUBST_STAGE.include_dir=       pre-configure
+SUBST_MESSAGE.include_dir=     fixing include paths for bindgen
+SUBST_FILES.include_dir+=      ../pgx/pgx-pg-sys/build.rs
+SUBST_VARS.include_dir+=       BUILDLINK_DIR
+
 post-extract:
        mv ${WRKDIR}/pgx-* ${WRKDIR}/pgx
 

Index: pkgsrc/databases/postgresql-promscale_extension/distinfo
diff -u pkgsrc/databases/postgresql-promscale_extension/distinfo:1.11 pkgsrc/databases/postgresql-promscale_extension/distinfo:1.12
--- pkgsrc/databases/postgresql-promscale_extension/distinfo:1.11       Mon Jul 18 19:47:26 2022
+++ pkgsrc/databases/postgresql-promscale_extension/distinfo    Mon Jul 18 22:14:25 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2022/07/18 19:47:26 tnn Exp $
+$NetBSD: distinfo,v 1.12 2022/07/18 22:14:25 tnn Exp $
 
 BLAKE2s (addr2line-0.17.0.crate) = f7fa3b016f0e80c4ea9967f8947de15edc9fa39d0c0cdea692dccd0c41c28039
 SHA512 (addr2line-0.17.0.crate) = ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
@@ -1234,4 +1234,5 @@ BLAKE2s (zip-0.5.13.crate) = ee4ef46046e
 SHA512 (zip-0.5.13.crate) = b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
 Size (zip-0.5.13.crate) = 48237 bytes
 SHA1 (patch-Cargo.toml) = e802be3306f9ac547a16fe4e1b34e21e2cb45ce6
+SHA1 (patch-pgx_pgx-pg-sys_build.rs) = 64ab5c741246a1a85300b80520ab2ebf7181b7fc
 SHA1 (patch-pgx_pgx-pg-sys_src_submodules_mod.rs) = 5ba3a3fd796d927f30857f077987a3bca2abf607

Added files:

Index: pkgsrc/databases/postgresql-promscale_extension/patches/patch-pgx_pgx-pg-sys_build.rs
diff -u /dev/null pkgsrc/databases/postgresql-promscale_extension/patches/patch-pgx_pgx-pg-sys_build.rs:1.1
--- /dev/null   Mon Jul 18 22:14:25 2022
+++ pkgsrc/databases/postgresql-promscale_extension/patches/patch-pgx_pgx-pg-sys_build.rs       Mon Jul 18 22:14:25 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-pgx_pgx-pg-sys_build.rs,v 1.1 2022/07/18 22:14:25 tnn Exp $
+
+Fix include directories for bindgen.
+
+--- ../pgx/pgx-pg-sys/build.rs.orig    2022-02-14 07:10:25.000000000 +0000
++++ ../pgx/pgx-pg-sys/build.rs
+@@ -468,10 +468,10 @@ struct StructDescriptor<'a> {
+ fn run_bindgen(pg_config: &PgConfig, include_h: &PathBuf) -> eyre::Result<syn::File> {
+     let major_version = pg_config.major_version()?;
+     eprintln!("Generating bindings for pg{}", major_version);
+-    let includedir_server = pg_config.includedir_server()?;
+     let bindings = bindgen::Builder::default()
+         .header(include_h.display().to_string())
+-        .clang_arg(&format!("-I{}", includedir_server.display()))
++        .clang_arg("-I@BUILDLINK_DIR@/include/postgresql/server")
++        .clang_arg("-I@BUILDLINK_DIR@/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")