[Mesa-dev] [PATCH v2 2/3] android, configure, meson: define HAVE_ZLIB

[Eric Engestrom]

On Wednesday, 2018-01-10 00:58:33 +0200, Grazvydas Ignotas wrote:
> The next change wants to use some optional zlib functionality, however
> not all platforms currently use it. Based on earlier Jordan Justen's
> patches and their review feedback.
> 
> Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
> ---
>  Android.common.mk | 1 +
>  configure.ac      | 1 +
>  meson.build       | 1 +

I think Android does unconditionally have zlib, but I'm not 100% sure.
For autotools and meson, as well as the rest of the series:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

>  3 files changed, 3 insertions(+)
> 
> diff --git a/Android.common.mk b/Android.common.mk
> index d9f871c..52dc7bf 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -68,10 +68,11 @@ LOCAL_CFLAGS += \
>  	-DHAVE___BUILTIN_UNREACHABLE \
>  	-DHAVE_PTHREAD=1 \
>  	-DHAVE_DLADDR \
>  	-DHAVE_DL_ITERATE_PHDR \
>  	-DHAVE_LINUX_FUTEX_H \
> +	-DHAVE_ZLIB \
>  	-DMAJOR_IN_SYSMACROS \
>  	-fvisibility=hidden \
>  	-Wno-sign-compare
>  
>  LOCAL_CPPFLAGS += \
> diff --git a/configure.ac b/configure.ac
> index 79f275d..e236a3c 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -904,10 +904,11 @@ esac
>  dnl See if posix_memalign is available
>  AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
>  
>  dnl Check for zlib
>  PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED])
> +DEFINES="$DEFINES -DHAVE_ZLIB"
>  
>  dnl Check for pthreads
>  AX_PTHREAD
>  if test "x$ax_pthread_ok" = xno; then
>      AC_MSG_ERROR([Building mesa on this platform requires pthreads])
> diff --git a/meson.build b/meson.build
> index 77e4e89..ae31cdd 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -941,10 +941,11 @@ if dep_libdrm.found()
>    endif
>  endif
>  
>  # TODO: some of these may be conditional
>  dep_zlib = dependency('zlib', version : '>= 1.2.3')
> +pre_args += '-DHAVE_ZLIB'
>  dep_thread = dependency('threads')
>  if dep_thread.found() and host_machine.system() != 'windows'
>    pre_args += '-DHAVE_PTHREAD'
>  endif
>  if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 or with_gallium_opencl
> -- 
> 2.7.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev