12:22 a.m.
When autogen.sh finishes it helpfully prints
"Now type 'make' to compile libvirt."
which is fine if on a host with GNU make, but on *BSD running
'make' will end in tears. We should tell users to run 'gmake'
on these platforms. If 'gmake' doesn't exist then we should
report an error too
"GNU make is required to build libvirt"
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
autogen.sh | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
index d5d836a..1e99ce8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -193,4 +193,21 @@ else
fi
echo
-echo "Now type 'make' to compile libvirt."
+
+# Make sure we can find GNU make and tell the user
+# the right command to run
+make -v | grep "GNU Make" 1>/dev/null 2>&1
+if test $? = 0
+then
+ MAKE=make
+else
+ which gmake 1>/dev/null 2>&1
+ if test $? = 0
+ then
+ MAKE=gmake
+ else
+ die "GNU make is required to build libvirt"
+ fi
+fi
+
+echo "Now type '$MAKE' to compile libvirt."
--
2.9.4
1:32 a.m.
On Tue, 2017-07-04 at 16:22 +0100, Daniel P. Berrange wrote:
I'd move this 'echo' to the bottom as well.
This doesn't catch stderr for the make invocation, and
FreeBSD's make doesn't support the -v flag so you'll
end up with a bunch of spurious output. You can use
make -v 2>&1 | grep -q "GNU Make"
instead.
+if test $? = 0
You're not using $? for anything else, so you can just
have the command above as condition for 'if'.
+then
The rest of the file puts 'then' on the same line as
'if', please keep it consistent.
Same comments as above. Additionally, you don't need
to mention fd 1 explicitly when redirecting stdout,
just '>/dev/null' is enough and looks less weird.
--
Andrea Bolognani / Red Hat / Virtualization
3:06 a.m.
On 07/05/2017 11:32 AM, Andrea Bolognani wrote:
In fact, gnulib's bootstrap script is already able to enforce
prerequisites, look for buildreq= in bootstrap.conf. But I don't know
if it is smart enough to make it easy to state that a project depends on
GNU make (not all projects have that dependency, but we do) - so maybe
it's worth hoisting the detection of an adequate (GNU) make into
gnulib's bootstrap script.
Yes, that is indeed important, if you like scraping help output. But it
may be better to test some other GNU-only functionality instead of just
scraping output (features, not versions, is always better when it comes
to probing for sufficient support) - the question is whether that can be
done in an equally compact manner.
Is it worth cc'ing the gnulib list for thoughts on incorporating the
notion of "this project requires GNU make" into the $buildreq handling
of bootstrap?
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
8:44 p.m.
On Wed, 2017-07-05 at 13:06 -0500, Eric Blake wrote:
I think we're using a bunch of construct that can only be
found in GNU make, so while having a more fine-grained
capability check would future-proof us in case (Free)BSD
make decides to implement the same features down the line
it's quite possibly more trouble than it's worth.
That sounds good. Not sure whether we should wait until
that's implemented or merge this (fixed) patch right away
and rewrite it in terms of gnulib's make detection once
that's available, though.
--
Andrea Bolognani / Red Hat / Virtualization
2826
days inactive
2833
days old
4 comments
4 participants
participants (4)
-
Andrea Bolognani -
Daniel P. Berrange -
Eric Blake -
Martin Kletzander