OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android,configure,meson: define HAVE_ZLIB

Browse Source 
The next change wants to use some optional zlib functionality, however
not all platforms currently use zlib. Based on earlier Jordan Justen's
patches and their review feedback.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Grazvydas Ignotas
2017-12-29 01:29:10 +02:00
parent b7347cc313
commit 87f723408b
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.common.mk
View File

@@ -70,6 +70,7 @@ LOCAL_CFLAGS += \
-DHAVE_DLADDR \ -DHAVE_DLADDR \
-DHAVE_DL_ITERATE_PHDR \ -DHAVE_DL_ITERATE_PHDR \
-DHAVE_LINUX_FUTEX_H \ -DHAVE_LINUX_FUTEX_H \
-DHAVE_ZLIB \
-DMAJOR_IN_SYSMACROS \ -DMAJOR_IN_SYSMACROS \
-fvisibility=hidden \ -fvisibility=hidden \
-Wno-sign-compare -Wno-sign-compare

1
configure.ac
View File

@@ -906,6 +906,7 @@ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
dnl Check for zlib dnl Check for zlib
PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED]) PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED])
DEFINES="$DEFINES -DHAVE_ZLIB"
dnl Check for pthreads dnl Check for pthreads
AX_PTHREAD AX_PTHREAD

1
meson.build
View File

@@ -943,6 +943,7 @@ endif
# TODO: some of these may be conditional # TODO: some of these may be conditional
dep_zlib = dependency('zlib', version : '>= 1.2.3') dep_zlib = dependency('zlib', version : '>= 1.2.3')
pre_args += '-DHAVE_ZLIB'
dep_thread = dependency('threads') dep_thread = dependency('threads')
if dep_thread.found() and host_machine.system() != 'windows' if dep_thread.found() and host_machine.system() != 'windows'
pre_args += '-DHAVE_PTHREAD' pre_args += '-DHAVE_PTHREAD'