1 |
On 5/3/20 2:31 PM, Mike Gilbert wrote: |
2 |
> Recent pkg-config should have the correct path built in by default. |
3 |
> |
4 |
> Bug: https://bugs.gentoo.org/720866 |
5 |
> Signed-off-by: Mike Gilbert <floppym@g.o> |
6 |
> --- |
7 |
> bin/phase-functions.sh | 4 ---- |
8 |
> 1 file changed, 4 deletions(-) |
9 |
> |
10 |
> diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
11 |
> index 709fd7527..90e622e75 100644 |
12 |
> --- a/bin/phase-functions.sh |
13 |
> +++ b/bin/phase-functions.sh |
14 |
> @@ -1019,10 +1019,6 @@ __ebuild_main() { |
15 |
> [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \ |
16 |
> addwrite "$DISTCC_DIR" |
17 |
> |
18 |
> - x=LIBDIR_$ABI |
19 |
> - [ -z "$PKG_CONFIG_PATH" -a -n "$ABI" -a -n "${!x}" ] && \ |
20 |
> - export PKG_CONFIG_PATH=${EPREFIX}/usr/${!x}/pkgconfig |
21 |
> - |
22 |
> if has noauto $FEATURES && \ |
23 |
> [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then |
24 |
> echo |
25 |
> |
26 |
|
27 |
Looks good. Please merge. |
28 |
-- |
29 |
Thanks, |
30 |
Zac |