Attachment 237910 Details for Bug 267550 – Proposed patch

[patch] Proposed patch

0002-Fix-build-error-from-bad-include-paths-in-pgx.patch (text/plain), 2.16 KB, created by Jony Hudson on 2022-11-06 21:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jony Hudson

Created: 2022-11-06 21:30:10 UTC

Size: 2.16 KB

patch

obsolete

>From d69c10acb48fc7c140c3822b65052e399c9e4e29 Mon Sep 17 00:00:00 2001
>From: Jony Hudson <jonyepsilon@google.com>
>Date: Sun, 6 Nov 2022 21:23:26 +0000
>Subject: [PATCH 2/2] Fix build error from bad include paths in pgx.
>
>It looks as though the pgx package does some code generation that makes assumptions
>about where libintl.h will be that are not true on FreeBSD.
>---
> databases/postgresql-promscale/Makefile                |  4 ++++
> databases/postgresql-promscale/files/pgx-include-patch | 10 ++++++++++
> 2 files changed, 14 insertions(+)
> create mode 100644 databases/postgresql-promscale/files/pgx-include-patch
>
>diff --git a/databases/postgresql-promscale/Makefile b/databases/postgresql-promscale/Makefile
>index 7c65d60943d6..aa80b0578804 100644
>--- a/databases/postgresql-promscale/Makefile
>+++ b/databases/postgresql-promscale/Makefile
>@@ -36,6 +36,10 @@ MAKE_ENV+=	MAKE=gmake PATH=${PATH}:${WRKDIR}/.cargo/bin
> 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
>+
> pre-build:
> 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} cargo install --offline --path ../pgx/cargo-pgx cargo-pgx
> 	mkdir -p ${WRKDIR}/.pgx
>diff --git a/databases/postgresql-promscale/files/pgx-include-patch b/databases/postgresql-promscale/files/pgx-include-patch
>new file mode 100644
>index 000000000000..90ea9b8be038
>--- /dev/null
>+++ b/databases/postgresql-promscale/files/pgx-include-patch
>@@ -0,0 +1,10 @@
>+--- 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")
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 267550: 237849 | 237850 | 237852 | 237910