Re: [libav-devel] [PATCH 02/12] configure: Merge compiler/libc/os hacks sections

[Vittorio Giovara]

On Tue, Jan 24, 2017 at 6:12 PM, Diego Biurrun  wrote:
> ---
>  configure | 27 +--
>  1 file changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/configure b/configure
> index 2c8b57e..f7436c5 100755
> --- a/configure
> +++ b/configure
> @@ -4097,26 +4097,25 @@ test -n "$libc_type" && enable libc_$libc_type
>  probe_libc host_
>  test -n "$host_libc_type" && enable host_libc_$host_libc_type
>
> +# hacks for compiler/libc/os combinations
> +
>  case $libc_type in
>  bionic)
>  add_compat strtod.o strtod=avpriv_strtod
>  ;;
> +glibc)
> +if enabled tms470; then
> +CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
> +add_cppflags -D__USER_LABEL_PREFIX__=
> +add_cppflags -D__builtin_memset=memset
> +add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
> +add_cflags   -pds=48# incompatible redefinition of macro
> +elif enabled ccc; then
> +add_ldflags -Wl,-z,now  # calls to libots crash without this
> +fi
> +;;
>  esac
>
> -# hacks for compiler/libc/os combinations
> -
> -if enabled_all tms470 libc_glibc; then
> -CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
> -add_cppflags -D__USER_LABEL_PREFIX__=
> -add_cppflags -D__builtin_memset=memset
> -add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
> -add_cflags   -pds=48# incompatible redefinition of macro
> -fi
> -
> -if enabled_all ccc libc_glibc; then
> -add_ldflags -Wl,-z,now  # calls to libots crash without this
> -fi
> -
>  check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" 
> ||
>  add_cppflags '-I\$(SRC_PATH)/compat/float'
>
> --

ok
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 02/12] configure: Merge compiler/libc/os hacks sections

[Diego Biurrun]

---
 configure | 27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 2c8b57e..f7436c5 100755
--- a/configure
+++ b/configure
@@ -4097,26 +4097,25 @@ test -n "$libc_type" && enable libc_$libc_type
 probe_libc host_
 test -n "$host_libc_type" && enable host_libc_$host_libc_type
 
+# hacks for compiler/libc/os combinations
+
 case $libc_type in
 bionic)
 add_compat strtod.o strtod=avpriv_strtod
 ;;
+glibc)
+if enabled tms470; then
+CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
+add_cppflags -D__USER_LABEL_PREFIX__=
+add_cppflags -D__builtin_memset=memset
+add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
+add_cflags   -pds=48# incompatible redefinition of macro
+elif enabled ccc; then
+add_ldflags -Wl,-z,now  # calls to libots crash without this
+fi
+;;
 esac
 
-# hacks for compiler/libc/os combinations
-
-if enabled_all tms470 libc_glibc; then
-CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
-add_cppflags -D__USER_LABEL_PREFIX__=
-add_cppflags -D__builtin_memset=memset
-add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
-add_cflags   -pds=48# incompatible redefinition of macro
-fi
-
-if enabled_all ccc libc_glibc; then
-add_ldflags -Wl,-z,now  # calls to libots crash without this
-fi
-
 check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" ||
 add_cppflags '-I\$(SRC_PATH)/compat/float'
 
-- 
2.1.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel