commit: 1769ce6cb3a9b6273033158574ed833b11eb7d0d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 6 05:44:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 6 05:44:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1769ce6c
postgres.eclass: stop using which(1) It's non-portable and we're looking to remove it from @system. Bug: https://bugs.gentoo.org/646588 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/postgres.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index 3ae1c49adc68..8e204e2ade8c 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -106,7 +106,7 @@ postgres_check_slot() { fi # Don't die because we can't run postgresql-config during pretend. - [[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \ + [[ "$EBUILD_PHASE" = "pretend" && -z "$(type -P postgresql-config 2> /dev/null)" ]] \ && return 0 if has $(postgresql-config show 2> /dev/null) "${POSTGRES_COMPAT[@]}"; then @@ -148,7 +148,7 @@ postgres_pkg_setup() { fi export PG_SLOT=${best_slot} - export PG_CONFIG=$(which pg_config${best_slot//./}) + export PG_CONFIG=$(type -P pg_config${best_slot//./}) local pg_pkg_config_path="$(${PG_CONFIG} --libdir)/pkgconfig" if [[ -n "${PKG_CONFIG_PATH}" ]]; then
