| 1 |
On Fri, 16 Oct 2015 03:22:48 +1100 |
| 2 |
Michael Palimaka <kensington@g.o> wrote: |
| 3 |
|
| 4 |
> On 16/10/15 03:04, Michał Górny wrote: |
| 5 |
> > |
| 6 |
> > |
| 7 |
> > Dnia 15 października 2015 17:44:47 CEST, Michael Palimaka <kensington@g.o> napisał(a): |
| 8 |
> >> This could happen if ninja is manually enabled (eg. make.conf) but not |
| 9 |
> >> installed |
| 10 |
> >> --- |
| 11 |
> >> eclass/cmake-utils.eclass | 5 +++++ |
| 12 |
> >> 1 file changed, 5 insertions(+) |
| 13 |
> >> |
| 14 |
> >> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 15 |
> >> index 480cd09..012b13f 100644 |
| 16 |
> >> --- a/eclass/cmake-utils.eclass |
| 17 |
> >> +++ b/eclass/cmake-utils.eclass |
| 18 |
> >> @@ -228,6 +228,11 @@ _generator_to_use() { |
| 19 |
> >> |
| 20 |
> >> case ${CMAKE_MAKEFILE_GENERATOR} in |
| 21 |
> >> ninja) |
| 22 |
> >> + # if ninja is enabled but not installed, the build could fail |
| 23 |
> >> + # this could happen if ninja is manually enabled (eg. make.conf) |
| 24 |
> >> but not installed |
| 25 |
> >> + if ! has_version dev-util/ninja; then |
| 26 |
> > |
| 27 |
> > I'd suggest avoiding has_version and just checking for the binary. type -P, I think. Ciaran can give you the rationale, I believe. |
| 28 |
> |
| 29 |
> There's no guarantee that the binary will be provided by dev-util/ninja |
| 30 |
> (we've had a bug about this already). |
| 31 |
|
| 32 |
Excuse me but did you agree with me, then commit the old version anyway? |
| 33 |
|
| 34 |
-- |
| 35 |
Best regards, |
| 36 |
Michał Górny |
| 37 |
<http://dev.gentoo.org/~mgorny/> |
Archives