From 1fe7aef6facf013a94eac853717f4da4d5d3c5b3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Dec 2022 09:09:23 +0000 Subject: gentoo auto-resync : 06:12:2022 - 09:09:23 --- eclass/postgres-multi.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'eclass/postgres-multi.eclass') diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass index c73f33c71b49..9dcf22e64a12 100644 --- a/eclass/postgres-multi.eclass +++ b/eclass/postgres-multi.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 inherit multibuild postgres @@ -58,7 +58,7 @@ export _POSTGRES_INTERSECT_SLOTS=( ) _postgres-multi_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" export PG_SLOT=${MULTIBUILD_VARIANT} - export PG_CONFIG=$(which pg_config${MULTIBUILD_VARIANT//./}) + export PG_CONFIG=$(type -P pg_config${MULTIBUILD_VARIANT//./}) if [[ -n ${PKG_CONFIG_PATH} ]] ; then PKG_CONFIG_PATH="$(${PG_CONFIG} --libdir)/pkgconfig:${PKG_CONFIG_PATH}" else @@ -139,7 +139,7 @@ postgres-multi_src_prepare() { # Portage, but won't be caught by /usr/bin/ebuild) local slot for slot in ${_POSTGRES_INTERSECT_SLOTS[@]} ; do - if [[ -z $(which pg_config${slot/.} 2> /dev/null) ]] ; then + if [[ -z $(type -P pg_config${slot/.} 2> /dev/null) ]] ; then eerror eerror "postgres_targets_postgres${slot/.} use flag is enabled, but hasn't been emerged." eerror -- cgit v1.2.3