Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
Date: Sat, 23 May 2020 06:17:53
Message-Id: 1590214649.a434c06e0cc970f1a507bb9f8f1a147accf79040.vapier@gentoo
1 commit: a434c06e0cc970f1a507bb9f8f1a147accf79040
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Sat May 23 01:58:41 2020 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sat May 23 06:17:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a434c06e
7
8 dev-lang/ghc: fix hardcoded pkg-config
9
10 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
11
12 dev-lang/ghc/ghc-7.10.3.ebuild | 2 +-
13 dev-lang/ghc/ghc-7.8.4.ebuild | 2 +-
14 dev-lang/ghc/ghc-8.0.2.ebuild | 2 +-
15 dev-lang/ghc/ghc-8.10.1.ebuild | 2 +-
16 dev-lang/ghc/ghc-8.2.1.ebuild | 2 +-
17 dev-lang/ghc/ghc-8.2.2.ebuild | 2 +-
18 dev-lang/ghc/ghc-8.4.1.ebuild | 2 +-
19 dev-lang/ghc/ghc-8.4.2.ebuild | 2 +-
20 dev-lang/ghc/ghc-8.4.3.ebuild | 2 +-
21 dev-lang/ghc/ghc-8.6.4.ebuild | 2 +-
22 dev-lang/ghc/ghc-8.6.5.ebuild | 2 +-
23 dev-lang/ghc/ghc-8.8.1.ebuild | 2 +-
24 dev-lang/ghc/ghc-8.8.2.ebuild | 2 +-
25 dev-lang/ghc/ghc-8.8.3.ebuild | 2 +-
26 14 files changed, 14 insertions(+), 14 deletions(-)
27
28 diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
29 index 1b8e5de541d..1112d5068ae 100644
30 --- a/dev-lang/ghc/ghc-7.10.3.ebuild
31 +++ b/dev-lang/ghc/ghc-7.10.3.ebuild
32 @@ -555,7 +555,7 @@ src_configure() {
33 echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
34 else
35 econf_args+=(--with-system-libffi)
36 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
37 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
38 fi
39
40 elog "Final mk/build.mk:"
41
42 diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
43 index 09a0b30498d..a8b740d67a7 100644
44 --- a/dev-lang/ghc/ghc-7.8.4.ebuild
45 +++ b/dev-lang/ghc/ghc-7.8.4.ebuild
46 @@ -466,7 +466,7 @@ src_configure() {
47
48 if ! use ghcmakebinary; then
49 econf_args+=(--with-system-libffi)
50 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
51 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
52 fi
53
54 econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
55
56 diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
57 index aceb46dd71e..8003bfbdd7a 100644
58 --- a/dev-lang/ghc/ghc-8.0.2.ebuild
59 +++ b/dev-lang/ghc/ghc-8.0.2.ebuild
60 @@ -551,7 +551,7 @@ src_configure() {
61 echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
62 else
63 econf_args+=(--with-system-libffi)
64 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
65 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
66 fi
67
68 elog "Final mk/build.mk:"
69
70 diff --git a/dev-lang/ghc/ghc-8.10.1.ebuild b/dev-lang/ghc/ghc-8.10.1.ebuild
71 index b9624ca1fcc..7845cce005c 100644
72 --- a/dev-lang/ghc/ghc-8.10.1.ebuild
73 +++ b/dev-lang/ghc/ghc-8.10.1.ebuild
74 @@ -624,7 +624,7 @@ src_configure() {
75 # using ${GTARGET}'s libffi is not supported yet:
76 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
77 econf_args+=(--with-system-libffi)
78 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
79 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
80 fi
81
82 einfo "Final mk/build.mk:"
83
84 diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild
85 index c701609e940..90df1309d8c 100644
86 --- a/dev-lang/ghc/ghc-8.2.1.ebuild
87 +++ b/dev-lang/ghc/ghc-8.2.1.ebuild
88 @@ -615,7 +615,7 @@ src_configure() {
89 # using ${GTARGET}'s libffi is not supported yet:
90 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
91 econf_args+=(--with-system-libffi)
92 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
93 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
94 fi
95
96 einfo "Final mk/build.mk:"
97
98 diff --git a/dev-lang/ghc/ghc-8.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild
99 index 7304fe4bcc2..83918fa3f68 100644
100 --- a/dev-lang/ghc/ghc-8.2.2.ebuild
101 +++ b/dev-lang/ghc/ghc-8.2.2.ebuild
102 @@ -616,7 +616,7 @@ src_configure() {
103 # using ${GTARGET}'s libffi is not supported yet:
104 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
105 econf_args+=(--with-system-libffi)
106 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
107 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
108 fi
109
110 einfo "Final mk/build.mk:"
111
112 diff --git a/dev-lang/ghc/ghc-8.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild
113 index bb77c83651a..49cb782a2de 100644
114 --- a/dev-lang/ghc/ghc-8.4.1.ebuild
115 +++ b/dev-lang/ghc/ghc-8.4.1.ebuild
116 @@ -616,7 +616,7 @@ src_configure() {
117 # using ${GTARGET}'s libffi is not supported yet:
118 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
119 econf_args+=(--with-system-libffi)
120 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
121 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
122 fi
123
124 einfo "Final mk/build.mk:"
125
126 diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild
127 index 1560843584d..75e81360795 100644
128 --- a/dev-lang/ghc/ghc-8.4.2.ebuild
129 +++ b/dev-lang/ghc/ghc-8.4.2.ebuild
130 @@ -621,7 +621,7 @@ src_configure() {
131 # using ${GTARGET}'s libffi is not supported yet:
132 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
133 econf_args+=(--with-system-libffi)
134 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
135 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
136 fi
137
138 einfo "Final mk/build.mk:"
139
140 diff --git a/dev-lang/ghc/ghc-8.4.3.ebuild b/dev-lang/ghc/ghc-8.4.3.ebuild
141 index 8d8af426473..0c291814a78 100644
142 --- a/dev-lang/ghc/ghc-8.4.3.ebuild
143 +++ b/dev-lang/ghc/ghc-8.4.3.ebuild
144 @@ -620,7 +620,7 @@ src_configure() {
145 # using ${GTARGET}'s libffi is not supported yet:
146 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
147 econf_args+=(--with-system-libffi)
148 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
149 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
150 fi
151
152 einfo "Final mk/build.mk:"
153
154 diff --git a/dev-lang/ghc/ghc-8.6.4.ebuild b/dev-lang/ghc/ghc-8.6.4.ebuild
155 index 2d192b4e58e..5a1785491a9 100644
156 --- a/dev-lang/ghc/ghc-8.6.4.ebuild
157 +++ b/dev-lang/ghc/ghc-8.6.4.ebuild
158 @@ -626,7 +626,7 @@ src_configure() {
159 # using ${GTARGET}'s libffi is not supported yet:
160 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
161 econf_args+=(--with-system-libffi)
162 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
163 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
164 fi
165
166 einfo "Final mk/build.mk:"
167
168 diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild
169 index e95768813ea..afbbcaccf02 100644
170 --- a/dev-lang/ghc/ghc-8.6.5.ebuild
171 +++ b/dev-lang/ghc/ghc-8.6.5.ebuild
172 @@ -632,7 +632,7 @@ src_configure() {
173 # using ${GTARGET}'s libffi is not supported yet:
174 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
175 econf_args+=(--with-system-libffi)
176 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
177 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
178 fi
179
180 einfo "Final mk/build.mk:"
181
182 diff --git a/dev-lang/ghc/ghc-8.8.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild
183 index 8d13a22eea7..ca9d69ec96c 100644
184 --- a/dev-lang/ghc/ghc-8.8.1.ebuild
185 +++ b/dev-lang/ghc/ghc-8.8.1.ebuild
186 @@ -635,7 +635,7 @@ src_configure() {
187 # using ${GTARGET}'s libffi is not supported yet:
188 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
189 econf_args+=(--with-system-libffi)
190 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
191 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
192 fi
193
194 einfo "Final mk/build.mk:"
195
196 diff --git a/dev-lang/ghc/ghc-8.8.2.ebuild b/dev-lang/ghc/ghc-8.8.2.ebuild
197 index 4d206d287dd..9abdb5cf242 100644
198 --- a/dev-lang/ghc/ghc-8.8.2.ebuild
199 +++ b/dev-lang/ghc/ghc-8.8.2.ebuild
200 @@ -634,7 +634,7 @@ src_configure() {
201 # using ${GTARGET}'s libffi is not supported yet:
202 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
203 econf_args+=(--with-system-libffi)
204 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
205 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
206 fi
207
208 einfo "Final mk/build.mk:"
209
210 diff --git a/dev-lang/ghc/ghc-8.8.3.ebuild b/dev-lang/ghc/ghc-8.8.3.ebuild
211 index 5d6e67ece45..16906855953 100644
212 --- a/dev-lang/ghc/ghc-8.8.3.ebuild
213 +++ b/dev-lang/ghc/ghc-8.8.3.ebuild
214 @@ -635,7 +635,7 @@ src_configure() {
215 # using ${GTARGET}'s libffi is not supported yet:
216 # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
217 econf_args+=(--with-system-libffi)
218 - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
219 + econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
220 fi
221
222 einfo "Final mk/build.mk:"
Report Message
Find on MARC Find on Google Groups