Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
> On 22 May 2020, at 12:19, Roger Pau Monné wrote: > > On Fri, May 22, 2020 at 10:05:53AM +0100, Wei Liu wrote: >> On Fri, May 22, 2020 at 08:41:17AM +, 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é Reviewed-by: Bertrand Marquis > > My bad, I assume [] is expanded by m4, as that seems to be part of the > language? > > Thanks, Roger.
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
On Fri, May 22, 2020 at 11:40:06AM +, Bertrand Marquis wrote: > > > > On 22 May 2020, at 12:19, Roger Pau Monné wrote: > > > > On Fri, May 22, 2020 at 10:05:53AM +0100, Wei Liu wrote: > >> On Fri, May 22, 2020 at 08:41:17AM +, 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é > Reviewed-by: Bertrand Marquis Thanks. I will transfer your tag to the proper patch I just sent. Wei.
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
On Fri, May 22, 2020 at 10:05:53AM +0100, Wei Liu wrote: > On Fri, May 22, 2020 at 08:41:17AM +, 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é My bad, I assume [] is expanded by m4, as that seems to be part of the language? Thanks, Roger.
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
On Fri, May 22, 2020 at 09:37:51AM +, Bertrand Marquis wrote: > Hi, > > > On 22 May 2020, at 10:05, Wei Liu wrote: > > > > On Fri, May 22, 2020 at 08:41:17AM +, 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 > > > > > > You will need to run autogen.sh to regenerate tools/configure. > > > > Yes that works on my side and generate tools/configure using “test” > > But why are the [] being removed when generating tools/configure ? No idea why autoconf removed [] really. I think switching to test is better anyway since that's what is used throughout tools/configure. Wei.
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
Hi, > On 22 May 2020, at 10:05, Wei Liu wrote: > > On Fri, May 22, 2020 at 08:41:17AM +, 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 > > > You will need to run autogen.sh to regenerate tools/configure. > Yes that works on my side and generate tools/configure using “test” But why are the [] being removed when generating tools/configure ? Bertrand > Wei. > >> >> Bertrand >> >>> On 5 May 2020, at 10:24, Roger Pau Monne wrote: >>> >>> The path provided by EXTRA_PREFIX should be added to the search path >>> of the configure script, like it's done in Config.mk. Not doing so >>> makes the search path for configure differ from the search path used >>> by the build. >>> >>> Signed-off-by: Roger Pau Monné >>> --- >>> Please re-run autoconf.sh after applying. >>> --- >>> m4/set_cflags_ldflags.m4 | 4 >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 >>> index cbad3c10b0..08f5c983cc 100644 >>> --- a/m4/set_cflags_ldflags.m4 >>> +++ b/m4/set_cflags_ldflags.m4 >>> @@ -15,6 +15,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"]) >>> >>> -- >>> 2.26.2
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
On Fri, May 22, 2020 at 08:41:17AM +, 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 You will need to run autogen.sh to regenerate tools/configure. Wei. > > Bertrand > > > On 5 May 2020, at 10:24, Roger Pau Monne wrote: > > > > The path provided by EXTRA_PREFIX should be added to the search path > > of the configure script, like it's done in Config.mk. Not doing so > > makes the search path for configure differ from the search path used > > by the build. > > > > Signed-off-by: Roger Pau Monné > > --- > > Please re-run autoconf.sh after applying. > > --- > > m4/set_cflags_ldflags.m4 | 4 > > 1 file changed, 4 insertions(+) > > > > diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 > > index cbad3c10b0..08f5c983cc 100644 > > --- a/m4/set_cflags_ldflags.m4 > > +++ b/m4/set_cflags_ldflags.m4 > > @@ -15,6 +15,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"]) > > > > -- > > 2.26.2 > > > > >
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
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) ? Bertrand > On 5 May 2020, at 10:24, Roger Pau Monne wrote: > > The path provided by EXTRA_PREFIX should be added to the search path > of the configure script, like it's done in Config.mk. Not doing so > makes the search path for configure differ from the search path used > by the build. > > Signed-off-by: Roger Pau Monné > --- > Please re-run autoconf.sh after applying. > --- > m4/set_cflags_ldflags.m4 | 4 > 1 file changed, 4 insertions(+) > > diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 > index cbad3c10b0..08f5c983cc 100644 > --- a/m4/set_cflags_ldflags.m4 > +++ b/m4/set_cflags_ldflags.m4 > @@ -15,6 +15,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"]) > > -- > 2.26.2 > >
Re: [PATCH 2/3] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
On Tue, May 05, 2020 at 11:24:53AM +0200, Roger Pau Monne wrote: > The path provided by EXTRA_PREFIX should be added to the search path > of the configure script, like it's done in Config.mk. Not doing so > makes the search path for configure differ from the search path used > by the build. > > Signed-off-by: Roger Pau Monné Acked-by: Wei Liu
