1 |
W dniu 12.03.2017, nie o godzinie 12∶35 +0100, użytkownik Alexis Ballier |
2 |
napisał: |
3 |
> On Sun, 12 Mar 2017 12:00:08 +0100 |
4 |
> Michał Górny <mgorny@g.o> wrote: |
5 |
> |
6 |
> > Make the substitution errors in prune_libtool_files logic fatal to |
7 |
> > avoid the dependency of eqawarn. They're extremely unlikely to happen |
8 |
> > anyway. --- |
9 |
> > eclass/eutils.eclass | 7 ++++--- |
10 |
> > 1 file changed, 4 insertions(+), 3 deletions(-) |
11 |
> > |
12 |
> > diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass |
13 |
> > index ab226b236a37..cb472caee1d4 100644 |
14 |
> > --- a/eclass/eutils.eclass |
15 |
> > +++ b/eclass/eutils.eclass |
16 |
> > @@ -982,9 +982,10 @@ prune_libtool_files() { |
17 |
> > for arg in |
18 |
> > ${libs}; do if [[ ${arg} == -l* ]]; then |
19 |
> > if |
20 |
> > [[ ${arg} == '*$*' ]]; then |
21 |
> > - |
22 |
> > eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}" |
23 |
> > - |
24 |
> > eqawarn "(arg: ${arg})" |
25 |
> > - |
26 |
> > eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND." |
27 |
> > + |
28 |
> > eerror "${FUNCNAME}: variable substitution likely failed in ${pc}" |
29 |
> > + |
30 |
> > eerror "(arg: ${arg})" |
31 |
> > + |
32 |
> > eerror "Most likely, you need to add virtual/pkgconfig to DEPEND." |
33 |
> > + |
34 |
> > die "${FUNCNAME}: unsubstituted variable found in .pc" fi |
35 |
> |
36 |
> If you go that way then it would be best if this function had a |
37 |
> 'has "virtual/pkgconfig" ${DEPEND} || die ...' kind of logic |
38 |
|
39 |
You can't reliably query DEPEND in an ebuild. |
40 |
|
41 |
> the message is more intended towards package maintainer and i would |
42 |
> assume they have pkgconfig installed which means the failure will |
43 |
> be on user's throat |
44 |
|
45 |
...in the extremely unlikely case of not having pkg-config installed. |
46 |
|
47 |
-- |
48 |
Best regards, |
49 |
Michał Górny |