dev-lang/ghc: fix hardcoded pkg-config

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index 1b8e5de541d75b17cd9a7bbdd3b8430d719e3462..1112d5068ae6c8e3f316fd405a2573229eae8eef 100644 (file)
--- 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 09a0b30498d4276e12f0d0ee7c8f98b1f3801d2c..a8b740d67a7823e922c0065b20faaf04da7c153d 100644 (file)
--- 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 aceb46dd71e5ebcb4062af7dcec43bda88aa2750..8003bfbdd7a9bde54e404a9f2829ed06abe9f14d 100644 (file)
--- 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 b9624ca1fcceac9443fb71757119a36e63db486e..7845cce005cc5e6f3d865b0bcd20aaeb0a75cf57 100644 (file)
--- 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 c701609e940a6f3f010df98db90465841e845fdf..90df1309d8c92f0c7c472264f1bc120537669650 100644 (file)
--- 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 7304fe4bcc2e6f5ce4fdaa698522e98e913e4fdb..83918fa3f684d11a93d28e628db0d5bb99b291d9 100644 (file)
--- 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 bb77c83651a14bbc294df5d2d1f9d6da5ac39800..49cb782a2defd1d1369d3ac8040e1426f9370067 100644 (file)
--- 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 1560843584dba8b0c472765cab3cc43abd93dad6..75e813607950415edd9a79bf6aa1162655e86484 100644 (file)
--- 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 8d8af426473824c35079ba9ed425fbde034d0983..0c291814a7857cc1f37f06a2204f92dcd5dfb225 100644 (file)
--- 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 2d192b4e58e040c005eddcbce4815dfeaf054009..5a1785491a9899c4422392b02c2d0ae2ee621841 100644 (file)
--- 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 e95768813eaccbeb8d0eff1d55a2cc40bf8f9074..afbbcaccf02c9c2d12c9fd537467ca00d5ac774f 100644 (file)
--- 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 8d13a22eea768e470d5cb42ce6c4bed11515bba8..ca9d69ec96c30c05b1c28205c0728dc2e2359ec9 100644 (file)
--- 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 4d206d287dd23726f62fd2abc7c1653a8c3ccafe..9abdb5cf2423e7c1090e0e6896214ec04a4234ba 100644 (file)
--- 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 5d6e67ece459bda9c43fa225cdc9c80de8b38e49..1690685595315604c3e63928416f91e0ea0dc5d1 100644 (file)
--- 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:"