[jhbuild] Use $MAKE if it is defined to build jhbuild itself.

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Raphael Kubo da Costa (:rakuco)]

[jhbuild] Use $MAKE if it is defined to build jhbuild itself.

[Raphael Kubo da Costa (:rakuco)]

Created attachment 133812 [details]
Patch

[Gustavo Noronha (kov)]

Comment on attachment 133812 [details]
Patch

A few lines before that we strip MAKE out, so this won't do good.

[Raphael Kubo da Costa (:rakuco)]

Actually, I wonder if it really makes sense to pass env_without_make to that call to make itself -- I mean, if you explicitly invoke "make", setting $MAKE to something else doesn't seem to have any effect.

[Gustavo Noronha (kov)]

That's a good point. If it still works if you set MAKE='make -j4' and remove that, then sure, it doesn't hurt to have it though.

[Raphael Kubo da Costa (:rakuco)]

Created attachment 133872 [details]
Patch

[Raphael Kubo da Costa (:rakuco)]

(In reply to comment #4)
> That's a good point. If it still works if you set MAKE='make -j4' and remove that, then sure, it doesn't hurt to have it though.

It does, and r112139 removed the os.environ workaround which was in place.

[Martin Robinson]

Comment on attachment 133872 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review

> Tools/jhbuild/jhbuild-wrapper:96
> +    make = shlex.split(os.environ.get('MAKE', 'make'))

Why not just os.environ.get('MAKE', 'make').split()[0] ?

[Raphael Kubo da Costa (:rakuco)]

(In reply to comment #7)
> (From update of attachment 133872 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review
> 
> > Tools/jhbuild/jhbuild-wrapper:96
> > +    make = shlex.split(os.environ.get('MAKE', 'make'))
> 
> Why not just os.environ.get('MAKE', 'make').split()[0] ?

If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3'].

[Martin Robinson]

(In reply to comment #8)

> If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3'].

In that case, why not os.environ.get('MAKE', 'make').split()?

>>> "make -j4".split()
['make', '-j4']

[Raphael Kubo da Costa (:rakuco)]

(In reply to comment #9)
> (In reply to comment #8)
> 
> > If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3'].
> 
> In that case, why not os.environ.get('MAKE', 'make').split()?
> 
> >>> "make -j4".split()
> ['make', '-j4']

Mostly because subprocess.Popen's documentation recommends using shlex.split() for proper argument tokenization. I can move to just using str.split() if that's preferred, though.

[Martin Robinson]

Comment on attachment 133872 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review

>>> Tools/jhbuild/jhbuild-wrapper:96
>>> +    make = shlex.split(os.environ.get('MAKE', 'make'))
>> 
>> Why not just os.environ.get('MAKE', 'make').split()[0] ?
> 
> If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3'].

Makes sense, thanks!

[Raphael Kubo da Costa (:rakuco)]

Committed r112153: <http://trac.webkit.org/changeset/112153>