diff mbox series

[1/2] configure: support passthrough of -Dxxx args to meson

Message ID 20230922135555.241809-2-berrange@redhat.com
State New
Headers show
Series Improve _FORTIFY_SOURCE robustness | expand

Commit Message

Daniel P. Berrangé Sept. 22, 2023, 1:55 p.m. UTC
This can be useful for setting some meson global options, such as the
optimization level or debug state, which don't have an analogous
option explicitly defined in QEMU's configure wrapper script.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

Comments

Peter Maydell Sept. 22, 2023, 2 p.m. UTC | #1
On Fri, 22 Sept 2023 at 14:56, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> This can be useful for setting some meson global options, such as the
> optimization level or debug state, which don't have an analogous
> option explicitly defined in QEMU's configure wrapper script.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

The commit message says it's adding support for a new feature...

> ---
>  configure | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/configure b/configure
> index e08127045d..cbd7e03e9f 100755
> --- a/configure
> +++ b/configure
> @@ -931,6 +931,8 @@ cat << EOF
>    bsd-user        all BSD usermode emulation targets
>    pie             Position Independent Executables
>
> +  -Dmesonoptname=val      passthrough option to meson unmodified
> +
>  NOTE: The object files are built at the place where configure is launched
>  EOF
>  exit 0

...but the patch is only updating the --help text. Is there
a missing piece of code here ?

thanks
-- PMM
Thomas Huth Sept. 22, 2023, 2:36 p.m. UTC | #2
On 22/09/2023 16.00, Peter Maydell wrote:
> On Fri, 22 Sept 2023 at 14:56, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>
>> This can be useful for setting some meson global options, such as the
>> optimization level or debug state, which don't have an analogous
>> option explicitly defined in QEMU's configure wrapper script.
>>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> 
> The commit message says it's adding support for a new feature...
> 
>> ---
>>   configure | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/configure b/configure
>> index e08127045d..cbd7e03e9f 100755
>> --- a/configure
>> +++ b/configure
>> @@ -931,6 +931,8 @@ cat << EOF
>>     bsd-user        all BSD usermode emulation targets
>>     pie             Position Independent Executables
>>
>> +  -Dmesonoptname=val      passthrough option to meson unmodified
>> +
>>   NOTE: The object files are built at the place where configure is launched
>>   EOF
>>   exit 0
> 
> ...but the patch is only updating the --help text. Is there
> a missing piece of code here ?

The patch has already been merged, see commit ff136d2a99253483f ... and IIRC 
I slightly modified it when picking it up (according to the patch 
description), so this here is likely a left-over of a rebase. Daniel, I 
think you can drop this patch here.

  Thomas
Daniel P. Berrangé Sept. 22, 2023, 2:42 p.m. UTC | #3
On Fri, Sep 22, 2023 at 04:36:00PM +0200, Thomas Huth wrote:
> On 22/09/2023 16.00, Peter Maydell wrote:
> > On Fri, 22 Sept 2023 at 14:56, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > > 
> > > This can be useful for setting some meson global options, such as the
> > > optimization level or debug state, which don't have an analogous
> > > option explicitly defined in QEMU's configure wrapper script.
> > > 
> > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > 
> > The commit message says it's adding support for a new feature...
> > 
> > > ---
> > >   configure | 2 ++
> > >   1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/configure b/configure
> > > index e08127045d..cbd7e03e9f 100755
> > > --- a/configure
> > > +++ b/configure
> > > @@ -931,6 +931,8 @@ cat << EOF
> > >     bsd-user        all BSD usermode emulation targets
> > >     pie             Position Independent Executables
> > > 
> > > +  -Dmesonoptname=val      passthrough option to meson unmodified
> > > +
> > >   NOTE: The object files are built at the place where configure is launched
> > >   EOF
> > >   exit 0
> > 
> > ...but the patch is only updating the --help text. Is there
> > a missing piece of code here ?
> 
> The patch has already been merged, see commit ff136d2a99253483f ... and IIRC
> I slightly modified it when picking it up (according to the patch
> description), so this here is likely a left-over of a rebase. Daniel, I
> think you can drop this patch here.

Opps, yes, a mistake updating an old branch.

With regards,
Daniel
diff mbox series

Patch

diff --git a/configure b/configure
index e08127045d..cbd7e03e9f 100755
--- a/configure
+++ b/configure
@@ -931,6 +931,8 @@  cat << EOF
   bsd-user        all BSD usermode emulation targets
   pie             Position Independent Executables
 
+  -Dmesonoptname=val      passthrough option to meson unmodified
+
 NOTE: The object files are built at the place where configure is launched
 EOF
 exit 0