| Message ID | 20190621130544.18860-1-lvivier@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | configure: linux-user doesn't need neither fdt nor slirp | expand |
Hi On Fri, Jun 21, 2019 at 3:05 PM Laurent Vivier <lvivier@redhat.com> wrote: > > if softmmu is not enabled, we disable by default fdt and > slirp as they are only used by -softmmu targets. > > A side effect is the git submodules are not cloned > if they are not needed. > > Clone and build can be forced with --enable-fdt and > --enable-slirp. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> lgtm Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > configure | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/configure b/configure > index b091b82cb371..4b3853298c79 100755 > --- a/configure > +++ b/configure > @@ -4066,6 +4066,11 @@ if test "$fdt_required" = "yes"; then > fdt=yes > fi > > +# linux-user doesn't need fdt > +if test -z "$fdt" -a "$softmmu" != "yes" ; then > + fdt="no" > +fi > + > if test "$fdt" != "no" ; then > fdt_libs="-lfdt" > # explicitly check for libfdt_env.h as it is missing in some stable installs > @@ -5923,6 +5928,11 @@ fi > ########################################## > # check for slirp > > +# linux-user doesn't need slirp > +if test -z "$slirp" -a "$softmmu" != "yes" ; then > + slirp="no" > +fi > + > case "$slirp" in > "" | yes) > if $pkg_config slirp; then > -- > 2.21.0 >
On 6/21/19 3:05 PM, Laurent Vivier wrote: > if softmmu is not enabled, we disable by default fdt and > slirp as they are only used by -softmmu targets. > > A side effect is the git submodules are not cloned > if they are not needed. > > Clone and build can be forced with --enable-fdt and > --enable-slirp. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > configure | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/configure b/configure > index b091b82cb371..4b3853298c79 100755 > --- a/configure > +++ b/configure > @@ -4066,6 +4066,11 @@ if test "$fdt_required" = "yes"; then > fdt=yes > fi > > +# linux-user doesn't need fdt "fdt is only required when building softmmu targets" (we don't need it to build tools such qemu-img) > +if test -z "$fdt" -a "$softmmu" != "yes" ; then > + fdt="no" > +fi > + > if test "$fdt" != "no" ; then > fdt_libs="-lfdt" > # explicitly check for libfdt_env.h as it is missing in some stable installs > @@ -5923,6 +5928,11 @@ fi > ########################################## > # check for slirp > > +# linux-user doesn't need slirp "slirp is only required when building softmmu targets" > +if test -z "$slirp" -a "$softmmu" != "yes" ; then > + slirp="no" > +fi > + > case "$slirp" in > "" | yes) > if $pkg_config slirp; then > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Le 21/06/2019 à 15:05, Laurent Vivier a écrit : > if softmmu is not enabled, we disable by default fdt and > slirp as they are only used by -softmmu targets. > > A side effect is the git submodules are not cloned > if they are not needed. > > Clone and build can be forced with --enable-fdt and > --enable-slirp. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > configure | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/configure b/configure > index b091b82cb371..4b3853298c79 100755 > --- a/configure > +++ b/configure > @@ -4066,6 +4066,11 @@ if test "$fdt_required" = "yes"; then > fdt=yes > fi > > +# linux-user doesn't need fdt > +if test -z "$fdt" -a "$softmmu" != "yes" ; then > + fdt="no" > +fi > + > if test "$fdt" != "no" ; then > fdt_libs="-lfdt" > # explicitly check for libfdt_env.h as it is missing in some stable installs > @@ -5923,6 +5928,11 @@ fi > ########################################## > # check for slirp > > +# linux-user doesn't need slirp > +if test -z "$slirp" -a "$softmmu" != "yes" ; then > + slirp="no" > +fi > + > case "$slirp" in > "" | yes) > if $pkg_config slirp; then > I've updated the comments according to Philippe's comments and applied it to my linux-user branch. Thanks, Laurent
diff --git a/configure b/configure index b091b82cb371..4b3853298c79 100755 --- a/configure +++ b/configure @@ -4066,6 +4066,11 @@ if test "$fdt_required" = "yes"; then fdt=yes fi +# linux-user doesn't need fdt +if test -z "$fdt" -a "$softmmu" != "yes" ; then + fdt="no" +fi + if test "$fdt" != "no" ; then fdt_libs="-lfdt" # explicitly check for libfdt_env.h as it is missing in some stable installs @@ -5923,6 +5928,11 @@ fi ########################################## # check for slirp +# linux-user doesn't need slirp +if test -z "$slirp" -a "$softmmu" != "yes" ; then + slirp="no" +fi + case "$slirp" in "" | yes) if $pkg_config slirp; then
if softmmu is not enabled, we disable by default fdt and slirp as they are only used by -softmmu targets. A side effect is the git submodules are not cloned if they are not needed. Clone and build can be forced with --enable-fdt and --enable-slirp. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+)