From 3a8423ee2874c2fd96358b28af08d38d83e9bdc0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Apr 2023 23:53:43 +0100 Subject: gentoo auto-resync : 17:04:2023 - 23:53:43 --- eclass/postgres.eclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'eclass/postgres.eclass') diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index e94ab56a40ae..95ed168d40a1 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: postgres.eclass @@ -6,7 +6,7 @@ # PostgreSQL # @AUTHOR: # Aaron W. Swenson -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: An eclass for PostgreSQL-related packages # @DESCRIPTION: # This eclass provides common utility functions that many @@ -15,7 +15,7 @@ # user to the postgres system group, and generating dependencies. case ${EAPI} in - 7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -65,6 +65,17 @@ declare -p POSTGRES_USEDEP &>/dev/null && POSTGRES_DEP+="[${POSTGRES_USEDEP}]" # required if the package must build against one of the PostgreSQL slots # declared in POSTGRES_COMPAT. +# @ECLASS_VARIABLE: PG_SLOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# PG_SLOT is the chosen PostgreSQL slot that is used for the build. + +# @ECLASS_VARIABLE: PG_CONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# PG_CONFIG is the path to pg_config for the chosen PostgreSQL slot. +# For example, PG_CONFIG="pg_config15" + # @ECLASS_VARIABLE: _POSTGRES_COMPAT # @INTERNAL # @DESCRIPTION: @@ -150,6 +161,10 @@ postgres_pkg_setup() { export PG_SLOT=${best_slot} export PG_CONFIG=$(type -P pg_config${best_slot//./}) + if [[ -z ${PG_CONFIG} ]] ; then + die "Could not find pg_config for ${PG_SLOT}. Is dev-db/postgresql:${PG_SLOT} installed?" + fi + local pg_pkg_config_path="$(${PG_CONFIG} --libdir)/pkgconfig" if [[ -n "${PKG_CONFIG_PATH}" ]]; then export PKG_CONFIG_PATH="${pg_pkg_config_path}:${PKG_CONFIG_PATH}" -- cgit v1.2.3