Merged.

On 12/01/16 21:37, Mike Holmes wrote:
> 
> 
> On 30 November 2016 at 15:32, Maxim Uvarov <maxim.uva...@linaro.org
> <mailto:maxim.uva...@linaro.org>> wrote:
> 
>     original configure.ac <http://configure.ac> enables abi compat mode
>     by default,
>     even without --enable-abi-compat provided. And has broken
>     logic to disable abi compat mode. Correct logic to build abi
>     compat mode and option to disable it. Shared library is not
>     needed for non abi compat mode, so turn it off.
> 
>     Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org
>     <mailto:maxim.uva...@linaro.org>>
> 
> 
> Reviewed-by: Mike Holmes <mike.hol...@linaro.org
> <mailto:mike.hol...@linaro.org>>
>  
> 
>     ---
>      configure.ac <http://configure.ac> | 9 ++++-----
>      1 file changed, 4 insertions(+), 5 deletions(-)
> 
>     diff --git a/configure.ac <http://configure.ac> b/configure.ac
>     <http://configure.ac>
>     index be5a292..b460a65 100644
>     --- a/configure.ac <http://configure.ac>
>     +++ b/configure.ac <http://configure.ac>
>     @@ -241,13 +241,11 @@ ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG"
>      ODP_ABI_COMPAT=1
>      abi_compat=yes
>      AC_ARG_ENABLE([abi-compat],
>     -    [  --enable-abi-compat     build all targets in ABI compatible
>     mode (default=yes)],
>     -    [if test "x$enableval" = "xyes"; then
>     -       ODP_ABI_COMPAT=1
>     -       abi_compat=yes
>     -     else
>     +    [  --disable-abi-compat     disables ABI compatible mode,
>     enables inline code in header files],
>     +    [if test "x$enableval" = "xno"; then
>             ODP_ABI_COMPAT=0
>             abi_compat=no
>     +       enable_shared=no
>          fi])
>      AC_SUBST(ODP_ABI_COMPAT)
> 
>     @@ -336,6 +334,7 @@ AC_MSG_RESULT([
>             static libraries:       ${enable_static}
>             shared libraries:       ${enable_shared}
>             ABI compatible:         ${abi_compat}
>     +       ODP_ABI_COMPAT:         ${ODP_ABI_COMPAT}
>             cunit:                  ${cunit_support}
>             test_vald:              ${test_vald}
>             test_perf:              ${test_perf}
>     --
>     2.7.1.250.gff4ea60
> 
> 
> 
> 
> -- 
> Mike Holmes
> Program Manager - Linaro Networking Group
> Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs
> "Work should be fun and collaborative, the rest follows"
> 
> __
> 
> 

Reply via email to