> On 22 May 2020, at 12:19, Roger Pau Monné <roger....@citrix.com> wrote: > > On Fri, May 22, 2020 at 10:05:53AM +0100, Wei Liu wrote: >> On Fri, May 22, 2020 at 08:41:17AM +0000, Bertrand Marquis wrote: >>> Hi, >>> >>> As a consequence of this fix, the following has been committed (I guess as >>> a consequence of regenerating the configure scripts): >>> diff --git a/tools/configure b/tools/configure >>> index 375430df3f..36596389b8 100755 >>> --- a/tools/configure >>> +++ b/tools/configure >>> @@ -4678,6 +4678,10 @@ for ldflag in $APPEND_LIB >>> do >>> APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" >>> done >>> +if ! -z $EXTRA_PREFIX ; then >>> + CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" >>> + LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" >>> +fi >>> CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" >>> LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS” >>> >>> This should be: >>> if [ ! -z $EXTRA_PREFIX ]; then >>> >>> As on other configure scripts. >>> >>> During configure I have not the following error: >>> ./configure: line 4681: -z: command not found >>> >>> Which is ignored but is adding -L/lib and -I/include to the CPPFLAGS and >>> LDFLAGS >>> >>> What should be the procedure to actually fix that (as the problem is coming >>> from the configure script regeneration I guess) ? >> >> Does the following patch work for you? >> >> diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 >> index 08f5c983cc63..cd34c139bc94 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 > > Reviewed-by: Roger Pau Monné <roger....@citrix.com> Reviewed-by: Bertrand Marquis <bertrand.marq...@arm.com>
> > My bad, I assume [] is expanded by m4, as that seems to be part of the > language? > > Thanks, Roger.
