commit: a434c06e0cc970f1a507bb9f8f1a147accf79040 Author: Mike Frysinger <vapier <AT> chromium <DOT> org> AuthorDate: Sat May 23 01:58:41 2020 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sat May 23 06:17:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a434c06e
dev-lang/ghc: fix hardcoded pkg-config Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> dev-lang/ghc/ghc-7.10.3.ebuild | 2 +- dev-lang/ghc/ghc-7.8.4.ebuild | 2 +- dev-lang/ghc/ghc-8.0.2.ebuild | 2 +- dev-lang/ghc/ghc-8.10.1.ebuild | 2 +- dev-lang/ghc/ghc-8.2.1.ebuild | 2 +- dev-lang/ghc/ghc-8.2.2.ebuild | 2 +- dev-lang/ghc/ghc-8.4.1.ebuild | 2 +- dev-lang/ghc/ghc-8.4.2.ebuild | 2 +- dev-lang/ghc/ghc-8.4.3.ebuild | 2 +- dev-lang/ghc/ghc-8.6.4.ebuild | 2 +- dev-lang/ghc/ghc-8.6.5.ebuild | 2 +- dev-lang/ghc/ghc-8.8.1.ebuild | 2 +- dev-lang/ghc/ghc-8.8.2.ebuild | 2 +- dev-lang/ghc/ghc-8.8.3.ebuild | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild index 1b8e5de541d..1112d5068ae 100644 --- a/dev-lang/ghc/ghc-7.10.3.ebuild +++ b/dev-lang/ghc/ghc-7.10.3.ebuild @@ -555,7 +555,7 @@ src_configure() { echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk else econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi elog "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild index 09a0b30498d..a8b740d67a7 100644 --- a/dev-lang/ghc/ghc-7.8.4.ebuild +++ b/dev-lang/ghc/ghc-7.8.4.ebuild @@ -466,7 +466,7 @@ src_configure() { if ! use ghcmakebinary; then econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild index aceb46dd71e..8003bfbdd7a 100644 --- a/dev-lang/ghc/ghc-8.0.2.ebuild +++ b/dev-lang/ghc/ghc-8.0.2.ebuild @@ -551,7 +551,7 @@ src_configure() { echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk else econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi elog "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.10.1.ebuild b/dev-lang/ghc/ghc-8.10.1.ebuild index b9624ca1fcc..7845cce005c 100644 --- a/dev-lang/ghc/ghc-8.10.1.ebuild +++ b/dev-lang/ghc/ghc-8.10.1.ebuild @@ -624,7 +624,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild index c701609e940..90df1309d8c 100644 --- a/dev-lang/ghc/ghc-8.2.1.ebuild +++ b/dev-lang/ghc/ghc-8.2.1.ebuild @@ -615,7 +615,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild index 7304fe4bcc2..83918fa3f68 100644 --- a/dev-lang/ghc/ghc-8.2.2.ebuild +++ b/dev-lang/ghc/ghc-8.2.2.ebuild @@ -616,7 +616,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild index bb77c83651a..49cb782a2de 100644 --- a/dev-lang/ghc/ghc-8.4.1.ebuild +++ b/dev-lang/ghc/ghc-8.4.1.ebuild @@ -616,7 +616,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild index 1560843584d..75e81360795 100644 --- a/dev-lang/ghc/ghc-8.4.2.ebuild +++ b/dev-lang/ghc/ghc-8.4.2.ebuild @@ -621,7 +621,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.4.3.ebuild b/dev-lang/ghc/ghc-8.4.3.ebuild index 8d8af426473..0c291814a78 100644 --- a/dev-lang/ghc/ghc-8.4.3.ebuild +++ b/dev-lang/ghc/ghc-8.4.3.ebuild @@ -620,7 +620,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.6.4.ebuild b/dev-lang/ghc/ghc-8.6.4.ebuild index 2d192b4e58e..5a1785491a9 100644 --- a/dev-lang/ghc/ghc-8.6.4.ebuild +++ b/dev-lang/ghc/ghc-8.6.4.ebuild @@ -626,7 +626,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild index e95768813ea..afbbcaccf02 100644 --- a/dev-lang/ghc/ghc-8.6.5.ebuild +++ b/dev-lang/ghc/ghc-8.6.5.ebuild @@ -632,7 +632,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.8.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild index 8d13a22eea7..ca9d69ec96c 100644 --- a/dev-lang/ghc/ghc-8.8.1.ebuild +++ b/dev-lang/ghc/ghc-8.8.1.ebuild @@ -635,7 +635,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.8.2.ebuild b/dev-lang/ghc/ghc-8.8.2.ebuild index 4d206d287dd..9abdb5cf242 100644 --- a/dev-lang/ghc/ghc-8.8.2.ebuild +++ b/dev-lang/ghc/ghc-8.8.2.ebuild @@ -634,7 +634,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-8.8.3.ebuild b/dev-lang/ghc/ghc-8.8.3.ebuild index 5d6e67ece45..16906855953 100644 --- a/dev-lang/ghc/ghc-8.8.3.ebuild +++ b/dev-lang/ghc/ghc-8.8.3.ebuild @@ -635,7 +635,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:"