From nobody Tue Nov 08 15:48:41 2022 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 4N6CF63MY6z4YJdB; Tue, 8 Nov 2022 15:48:42 +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 4N6CF621bfz3pX9; Tue, 8 Nov 2022 15:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667922522; 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=gxnP0Fgt1XHuRaDrYAAT3IS5EsG8av75is0MoKpufCo=; b=Eg+yDKuLjVvn1RfykbvqWuW55yu91Qc/lMXhD+Xtnrnov5Rut0LRlfys5N8iaBd0FFk37H xaAxxNy6dvF/AOpP1mLFO3znMnpy0aF7NIwZ5faK4a7fK8avliQ3Kmjy/GfLdYtaJTb8XD hETjl/rwiYxUyPfZR/VlaOtyOyZIzjc+YdUKKT3CNAI8X9zzrt9KFW46KkXxNm+lD4T2+r maze9z9vffwW9+IL1ydpCvGM7P8Xod8e83MJ835WiCkHBd3dM3sFGVMJ1iCQ9VAPe7mm/u BBPf80xc6i1Eckn0PMG3elFaQQMyOXyDBgVwflQSWQt2mHU/aSPW/JyCKWSVrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667922522; 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=gxnP0Fgt1XHuRaDrYAAT3IS5EsG8av75is0MoKpufCo=; b=V06/IP0Ejs5ZAKKYQNhdopaDMNA/fQUUOGChjxLY1zpCanDQYPKaNNsov3fdeh2t/eU2Zd cHj/UAK4wuOA3P69rw95gEDVOB7Py7BKw2NEscrhVdltjlpbwLbnzC/bk9JXv5vJbo20Gq nCEAwI3Fs1Zjiv+gcWUYf+3UiniaycCC6m3X6A7o/M9TY09io1bGzvS1uSV/goErM1T4FH tN/DOcBugI2Vu3rszA6clsrG1g+wlBMng35eZb/goeau5++TfwHClbl8vlgeBzOBvw8OSg vfIyRynrgjOpVzlMqICx1dO9RKpTt9FjVT79kpiALhy7Ui9go2Z14BkYUMv4vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667922522; a=rsa-sha256; cv=none; b=hJobYT0XrlYRuGpmULNEqo+Ii6nql9I41urDJOJgiGxJpHcRvKqXK94Ghvn9zCb4uurAoW 93CvNmkb2A/UPLqYOs7gANdph5bVQ+eIr6NGmyELqFJMUedQOOPfPEC0WpwRPjFHwUUcV6 MFBFoVrQNQJJack4Wp58trF9VRWKco4TBcBvzNZiP5RvCwQ7UtvBRVK+LBlbo/tqy28bV3 YkjoeV8srS8ZcynlSdr38pZ+4V7/brNllaOKVKqsp96jvt/dym7xir61Ai37UpPXH5HzaJ uvySicZrcm4AXTaAvCV+GcB6mI1VF3MQ8lqTQlesJ9Jpzg38bqx3YVSmGGxDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6CF60q61znWX; Tue, 8 Nov 2022 15:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A8Fmfff015178; Tue, 8 Nov 2022 15:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8Fmf6v015177; Tue, 8 Nov 2022 15:48:41 GMT (envelope-from git) Date: Tue, 8 Nov 2022 15:48:41 GMT Message-Id: <202211081548.2A8Fmf6v015177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Felder Subject: git: 2735159edc4e - main - databases/postgresql-promscale: Fix build with NLS 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: feld X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2735159edc4ead9807d366b856ef26e546df849b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by feld: URL: https://cgit.FreeBSD.org/ports/commit/?id=2735159edc4ead9807d366b856ef26e546df849b commit 2735159edc4ead9807d366b856ef26e546df849b Author: Mark Felder AuthorDate: 2022-11-08 15:47:47 +0000 Commit: Mark Felder CommitDate: 2022-11-08 15:47:47 +0000 databases/postgresql-promscale: Fix build with NLS PR: 267550 --- databases/postgresql-promscale/Makefile | 6 +++++- databases/postgresql-promscale/files/pgx-include-patch | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/databases/postgresql-promscale/Makefile b/databases/postgresql-promscale/Makefile index 7c65d60943d6..ce226577d5ab 100644 --- a/databases/postgresql-promscale/Makefile +++ b/databases/postgresql-promscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= promscale PORTVERSION= 0.7.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- @@ -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")