| Message ID | 20200602090138.28656-1-wl@xen.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [[PATCH,v2,for-4.14] ] m4: use test instead of [] | expand |
> -----Original Message----- > From: Wei Liu <wl@xen.org> > Sent: 02 June 2020 10:02 > To: Xen Development List <xen-devel@lists.xenproject.org> > Cc: Wei Liu <wl@xen.org>; Bertrand Marquis <Bertrand.Marquis@arm.com>; Roger Pau Monne > <roger.pau@citrix.com>; paul@xen.org; Ian Jackson <ian.jackson@eu.citrix.com> > Subject: [[PATCH v2 for-4.14]] m4: use test instead of [] > > It is reported that [] was removed by autoconf, which caused the > following error: > > ./configure: line 4681: -z: command not found > > Switch to test. That's what is used throughout our configure scripts. > Also put the variable expansion in quotes. > > Signed-off-by: Wei Liu <wl@xen.org> > Reported-by: Bertrand Marquis <Bertrand.Marquis@arm.com> > Fixes: 8a6b1665d987 ("configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS") > Signed-off-by: Wei Liu <wl@xen.org> > --- > v2: Address Ian's comment. > > Run autogen.sh before committing. > > Cc: Bertrand Marquis <Bertrand.Marquis@arm.com> > Cc: Roger Pau Monne <roger.pau@citrix.com> > Cc: paul@xen.org Yes, pretty clearly wrong in the original patch. Release-acked-by: Paul Durrant <paul@xen.org> > --- > m4/set_cflags_ldflags.m4 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 > index 08f5c983cc63..23706e256b42 100644 > --- a/m4/set_cflags_ldflags.m4 > +++ b/m4/set_cflags_ldflags.m4 > @@ -15,7 +15,7 @@ for ldflag in $APPEND_LIB > do > APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" > done > -if [ ! -z $EXTRA_PREFIX ]; then > +if test ! -z "$EXTRA_PREFIX" ; then > CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" > LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" > fi > -- > 2.20.1
There's a double [] enclosure in the subject On Tue, Jun 02, 2020 at 09:01:38AM +0000, Wei Liu wrote: > It is reported that [] was removed by autoconf, which caused the > following error: > > ./configure: line 4681: -z: command not found > > Switch to test. That's what is used throughout our configure scripts. > Also put the variable expansion in quotes. > > Signed-off-by: Wei Liu <wl@xen.org> > Reported-by: Bertrand Marquis <Bertrand.Marquis@arm.com> > Fixes: 8a6b1665d987 ("configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS") > Signed-off-by: Wei Liu <wl@xen.org> There's a double SoB ;) Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Thanks for taking care of this.
Roger Pau Monne writes ("Re: [[PATCH v2 for-4.14]] m4: use test instead of []"):
> There's a double [] enclosure in the subject
>
> On Tue, Jun 02, 2020 at 09:01:38AM +0000, Wei Liu wrote:
> > It is reported that [] was removed by autoconf, which caused the
> > following error:
> >
> > ./configure: line 4681: -z: command not found
> >
> > Switch to test. That's what is used throughout our configure scripts.
> > Also put the variable expansion in quotes.
> >
> > Signed-off-by: Wei Liu <wl@xen.org>
> > Reported-by: Bertrand Marquis <Bertrand.Marquis@arm.com>
> > Fixes: 8a6b1665d987 ("configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS")
> > Signed-off-by: Wei Liu <wl@xen.org>
>
> There's a double SoB ;)
>
> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Pushed, thanks.
Ian.
diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 index 08f5c983cc63..23706e256b42 100644 --- a/m4/set_cflags_ldflags.m4 +++ b/m4/set_cflags_ldflags.m4 @@ -15,7 +15,7 @@ for ldflag in $APPEND_LIB do APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done -if [ ! -z $EXTRA_PREFIX ]; then +if test ! -z "$EXTRA_PREFIX" ; then CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" fi