For the users, it looks a little bit weird that capstone and slirp are
not disabled automatically if they run the configure script with the
"--without-default-features" option, so let's do that now.
Note: fdt is *not* changed accordingly since this affects the targets
that we can build, so disabling fdt automatically here might have
unexpected side-effects for the users.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
I thought I sent out that patch a couple of weeks ago already, but
I cannot find it in the archives, so I likely missed to send it
correctly. Anyway, sorry if you've got this twice!
configure | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 3a29eff5cc..36d10d95bb 100755
--- a/configure
+++ b/configure
@@ -361,9 +361,14 @@ slirp_smbd="$default_feature"
# are included in the automatically generated help message)
# 1. Track which submodules are needed
-capstone="auto"
+if test "$default_feature" = no ; then
+ capstone="disabled"
+ slirp="disabled"
+else
+ capstone="auto"
+ slirp="auto"
+fi
fdt="auto"
-slirp="auto"
# 2. Support --with/--without option
default_devices="true"
--
2.27.0
Thomas Huth, le lun. 21 févr. 2022 10:06:47 +0100, a ecrit: > For the users, it looks a little bit weird that capstone and slirp are > not disabled automatically if they run the configure script with the > "--without-default-features" option, so let's do that now. > Note: fdt is *not* changed accordingly since this affects the targets > that we can build, so disabling fdt automatically here might have > unexpected side-effects for the users. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > I thought I sent out that patch a couple of weeks ago already, but > I cannot find it in the archives, so I likely missed to send it > correctly. Anyway, sorry if you've got this twice! > > configure | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 3a29eff5cc..36d10d95bb 100755 > --- a/configure > +++ b/configure > @@ -361,9 +361,14 @@ slirp_smbd="$default_feature" > # are included in the automatically generated help message) > > # 1. Track which submodules are needed > -capstone="auto" > +if test "$default_feature" = no ; then > + capstone="disabled" > + slirp="disabled" > +else > + capstone="auto" > + slirp="auto" > +fi > fdt="auto" > -slirp="auto" > > # 2. Support --with/--without option > default_devices="true" > -- > 2.27.0
On 2/21/22 10:06, Thomas Huth wrote: > For the users, it looks a little bit weird that capstone and slirp are > not disabled automatically if they run the configure script with the > "--without-default-features" option, so let's do that now. > Note: fdt is*not* changed accordingly since this affects the targets > that we can build, so disabling fdt automatically here might have > unexpected side-effects for the users. I suppose that's why it wasn't done for any of the submodules, but your way makes sense as well (possibly _more_ sense). Acked-by: Paolo Bonzini <pbonzini@redhat.com> Paolo
Le 21/02/2022 à 10:06, Thomas Huth a écrit : > For the users, it looks a little bit weird that capstone and slirp are > not disabled automatically if they run the configure script with the > "--without-default-features" option, so let's do that now. > Note: fdt is *not* changed accordingly since this affects the targets > that we can build, so disabling fdt automatically here might have > unexpected side-effects for the users. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > I thought I sent out that patch a couple of weeks ago already, but > I cannot find it in the archives, so I likely missed to send it > correctly. Anyway, sorry if you've got this twice! > > configure | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 3a29eff5cc..36d10d95bb 100755 > --- a/configure > +++ b/configure > @@ -361,9 +361,14 @@ slirp_smbd="$default_feature" > # are included in the automatically generated help message) > > # 1. Track which submodules are needed > -capstone="auto" > +if test "$default_feature" = no ; then > + capstone="disabled" > + slirp="disabled" > +else > + capstone="auto" > + slirp="auto" > +fi > fdt="auto" > -slirp="auto" > > # 2. Support --with/--without option > default_devices="true" Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.