[PATCH] phase-functions.sh: do not set PKG_CONFIG_PATH

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] phase-functions.sh: do not set PKG_CONFIG_PATH

Mike Gilbert-2
Recent pkg-config should have the correct path built in by default.

Bug: https://bugs.gentoo.org/720866
Signed-off-by: Mike Gilbert <[hidden email]>
---
 bin/phase-functions.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 709fd7527..90e622e75 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1019,10 +1019,6 @@ __ebuild_main() {
  [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \
  addwrite "$DISTCC_DIR"
 
- x=LIBDIR_$ABI
- [ -z "$PKG_CONFIG_PATH" -a -n "$ABI" -a -n "${!x}" ] && \
- export PKG_CONFIG_PATH=${EPREFIX}/usr/${!x}/pkgconfig
-
  if has noauto $FEATURES && \
  [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then
  echo
--
2.26.2


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] phase-functions.sh: do not set PKG_CONFIG_PATH

Zac Medico-2
On 5/3/20 2:31 PM, Mike Gilbert wrote:

> Recent pkg-config should have the correct path built in by default.
>
> Bug: https://bugs.gentoo.org/720866
> Signed-off-by: Mike Gilbert <[hidden email]>
> ---
>  bin/phase-functions.sh | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
> index 709fd7527..90e622e75 100644
> --- a/bin/phase-functions.sh
> +++ b/bin/phase-functions.sh
> @@ -1019,10 +1019,6 @@ __ebuild_main() {
>   [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \
>   addwrite "$DISTCC_DIR"
>  
> - x=LIBDIR_$ABI
> - [ -z "$PKG_CONFIG_PATH" -a -n "$ABI" -a -n "${!x}" ] && \
> - export PKG_CONFIG_PATH=${EPREFIX}/usr/${!x}/pkgconfig
> -
>   if has noauto $FEATURES && \
>   [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then
>   echo
>
Looks good. Please merge.
--
Thanks,
Zac


signature.asc (1000 bytes) Download Attachment