diff options
author | gdt <gdt@pkgsrc.org> | 2022-10-16 14:42:49 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2022-10-16 14:42:49 +0000 |
commit | f3d35815dba969491631042e22bd55ab078609f9 (patch) | |
tree | 81abd642a4c1509efee827ac9ad4f235f2ce1210 | |
parent | ac28bd00b553050c2b7c83bb80987b70bbc61481 (diff) | |
download | pkgsrc-f3d35815dba969491631042e22bd55ab078609f9.tar.gz |
databases/postgresql*: Work around autoconf mkdir bug
autoconf does not accept NetBSD mkdir (this bug has already been fixed
in upstream autoconf). This leads to install.sh, and thus
postgresql's workaround for a relative path in pgxs, and then that
being used in postgis. Somewhere in that chain there is a bug leading
to postgis failing to make a directory at install time.
This passes in an autoconf cache variable so that for mkdir it uses
mkdir (which it does on GNU/Linux, and thus that situation is
well-tested).
-rw-r--r-- | databases/postgresql10-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql10/Makefile.common | 8 | ||||
-rw-r--r-- | databases/postgresql11-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql11/Makefile.common | 8 | ||||
-rw-r--r-- | databases/postgresql13-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql13/Makefile.common | 8 | ||||
-rw-r--r-- | databases/postgresql14-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql14/Makefile.common | 8 |
8 files changed, 36 insertions, 8 deletions
diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile index 478c2741fb5..7351baf74bd 100644 --- a/databases/postgresql10-client/Makefile +++ b/databases/postgresql10-client/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2022/08/15 20:59:35 adam Exp $ +# $NetBSD: Makefile,v 1.29 2022/10/16 14:42:49 gdt Exp $ PKGNAME= ${DISTNAME:S/-/10-client-/} +PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql10/Makefile.common" diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index 436e501c39a..c6305aa3ab9 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2022/08/15 20:59:35 adam Exp $ +# $NetBSD: Makefile.common,v 1.36 2022/10/16 14:42:49 gdt Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -68,6 +68,12 @@ CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-tcl +# Work around a bug in autoconf, that thinks almost all mkdir +# implementations are deficient, and a bug someplace between postgis +# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh +# but without a path. +CONFIGURE_ENV+= ac_cv_path_mkdir="mkdir" + # avoid pointing to a wrapper CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} diff --git a/databases/postgresql11-client/Makefile b/databases/postgresql11-client/Makefile index 30f4392438c..b885d2ddbcc 100644 --- a/databases/postgresql11-client/Makefile +++ b/databases/postgresql11-client/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2022/08/15 20:59:36 adam Exp $ +# $NetBSD: Makefile,v 1.25 2022/10/16 14:42:50 gdt Exp $ PKGNAME= ${DISTNAME:S/-/11-client-/} +PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql11/Makefile.common" diff --git a/databases/postgresql11/Makefile.common b/databases/postgresql11/Makefile.common index 1445212b236..f685271235e 100644 --- a/databases/postgresql11/Makefile.common +++ b/databases/postgresql11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2022/10/03 07:50:27 nia Exp $ +# $NetBSD: Makefile.common,v 1.30 2022/10/16 14:42:50 gdt Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -68,6 +68,12 @@ CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-tcl +# Work around a bug in autoconf, that thinks almost all mkdir +# implementations are deficient, and a bug someplace between postgis +# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh +# but without a path. +CONFIGURE_ENV+= ac_cv_path_mkdir="mkdir" + # avoid pointing to a wrapper CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile index 2ae3a200d8d..5cd4c25328a 100644 --- a/databases/postgresql13-client/Makefile +++ b/databases/postgresql13-client/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2022/08/15 20:59:38 adam Exp $ +# $NetBSD: Makefile,v 1.21 2022/10/16 14:42:50 gdt Exp $ PKGNAME= ${DISTNAME:S/-/13-client-/} +PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql13/Makefile.common" diff --git a/databases/postgresql13/Makefile.common b/databases/postgresql13/Makefile.common index 464b6510b30..249df62b539 100644 --- a/databases/postgresql13/Makefile.common +++ b/databases/postgresql13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2022/10/03 07:50:27 nia Exp $ +# $NetBSD: Makefile.common,v 1.16 2022/10/16 14:42:50 gdt Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -68,6 +68,12 @@ CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-tcl +# Work around a bug in autoconf, that thinks almost all mkdir +# implementations are deficient, and a bug someplace between postgis +# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh +# but without a path. +CONFIGURE_ENV+= ac_cv_path_mkdir="mkdir" + # avoid pointing to a wrapper CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile index 4f19b32ffbd..005712c531b 100644 --- a/databases/postgresql14-client/Makefile +++ b/databases/postgresql14-client/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2022/08/15 20:59:39 adam Exp $ +# $NetBSD: Makefile,v 1.11 2022/10/16 14:42:50 gdt Exp $ PKGNAME= ${DISTNAME:S/-/14-client-/} +PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql14/Makefile.common" diff --git a/databases/postgresql14/Makefile.common b/databases/postgresql14/Makefile.common index ad0678388fa..c397abe7fa7 100644 --- a/databases/postgresql14/Makefile.common +++ b/databases/postgresql14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2022/08/15 20:59:39 adam Exp $ +# $NetBSD: Makefile.common,v 1.8 2022/10/16 14:42:50 gdt Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -68,6 +68,12 @@ CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-tcl +# Work around a bug in autoconf, that thinks almost all mkdir +# implementations are deficient, and a bug someplace between postgis +# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh +# but without a path. +CONFIGURE_ENV+= ac_cv_path_mkdir="mkdir" + # avoid pointing to a wrapper CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} |