Re: [lng-odp] [PATCHv3] validation: configure: move cflags guards to test/m4
Merged, Maxim. On 04/07/16 17:49, Anders Roxell wrote: On 2016-04-07 17:12, Maxim Uvarov wrote: Move cflags guards to test/m4 to fix cunit library search. https://bugs.linaro.org/show_bug.cgi?id=2161 Guess you should add that it failed when building --with-cunit-path=... Reported-by: Brian BrooksSuggested-by: Anders Roxell Signed-off-by: Maxim Uvarov if fixing the changelog. Reviewed-by: Anders Roxell --- v3: drop patch 1. (btw there were no reject). configure.ac | 14 -- test/m4/validation.m4 | 14 ++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 712d241..9665d1d 100644 --- a/configure.ac +++ b/configure.ac @@ -176,20 +176,6 @@ AC_ARG_ENABLE([debug], ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" ## -# Save and set temporary compilation flags -## -OLD_LDFLAGS=$LDFLAGS -OLD_CPPFLAGS=$CPPFLAGS -LDFLAGS="$AM_LDFLAGS $LDFLAGS" -CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" - -## -# Restore old saved variables -## -LDFLAGS=$OLD_LDFLAGS -CPPFLAGS=$OLD_CPPFLAGS - -## # Default warning setup ## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes" diff --git a/test/m4/validation.m4 b/test/m4/validation.m4 index b137118..d32f675 100644 --- a/test/m4/validation.m4 +++ b/test/m4/validation.m4 @@ -31,6 +31,14 @@ AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], cunit_support=yes],[]) ## +# Save and set temporary compilation flags +## +OLD_LDFLAGS=$LDFLAGS +OLD_CPPFLAGS=$CPPFLAGS +LDFLAGS="$AM_LDFLAGS $LDFLAGS" +CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + +## # Check for CUnit availability ## if test x$cunit_support = xyes @@ -42,3 +50,9 @@ then else cunit_support=no fi + +## +# Restore old saved variables +## +LDFLAGS=$OLD_LDFLAGS +CPPFLAGS=$OLD_CPPFLAGS -- 2.7.1.250.gff4ea60 ___ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp ___ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp
Re: [lng-odp] [PATCHv3] validation: configure: move cflags guards to test/m4
On 2016-04-07 17:12, Maxim Uvarov wrote: > Move cflags guards to test/m4 to fix cunit > library search. > https://bugs.linaro.org/show_bug.cgi?id=2161 Guess you should add that it failed when building --with-cunit-path=... > > Reported-by: Brian Brooks> Suggested-by: Anders Roxell > Signed-off-by: Maxim Uvarov if fixing the changelog. Reviewed-by: Anders Roxell > --- > v3: drop patch 1. (btw there were no reject). > > configure.ac | 14 -- > test/m4/validation.m4 | 14 ++ > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 712d241..9665d1d 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -176,20 +176,6 @@ AC_ARG_ENABLE([debug], > ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" > > ## > -# Save and set temporary compilation flags > -## > -OLD_LDFLAGS=$LDFLAGS > -OLD_CPPFLAGS=$CPPFLAGS > -LDFLAGS="$AM_LDFLAGS $LDFLAGS" > -CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" > - > -## > -# Restore old saved variables > -## > -LDFLAGS=$OLD_LDFLAGS > -CPPFLAGS=$OLD_CPPFLAGS > - > -## > # Default warning setup > ## > ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes > -Wmissing-prototypes" > diff --git a/test/m4/validation.m4 b/test/m4/validation.m4 > index b137118..d32f675 100644 > --- a/test/m4/validation.m4 > +++ b/test/m4/validation.m4 > @@ -31,6 +31,14 @@ AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs > and headers], > cunit_support=yes],[]) > > ## > +# Save and set temporary compilation flags > +## > +OLD_LDFLAGS=$LDFLAGS > +OLD_CPPFLAGS=$CPPFLAGS > +LDFLAGS="$AM_LDFLAGS $LDFLAGS" > +CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" > + > +## > # Check for CUnit availability > ## > if test x$cunit_support = xyes > @@ -42,3 +50,9 @@ then > else > cunit_support=no > fi > + > +## > +# Restore old saved variables > +## > +LDFLAGS=$OLD_LDFLAGS > +CPPFLAGS=$OLD_CPPFLAGS > -- > 2.7.1.250.gff4ea60 > > ___ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp ___ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp