diff options
| author | Dudemanguy <random342@airmail.cc> | 2021-11-15 10:03:56 -0600 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-11-15 12:40:00 -0500 |
| commit | a4b4b219085de40612e8f8b65ab994e305ea4eee (patch) | |
| tree | 3280ff9d5a1f0e67b3cf49ea49c8f2d124638f03 | |
| parent | 680c6bb012c4566935d2589565ef4d2031442307 (diff) | |
| download | meson-a4b4b219085de40612e8f8b65ab994e305ea4eee.zip meson-a4b4b219085de40612e8f8b65ab994e305ea4eee.tar.gz meson-a4b4b219085de40612e8f8b65ab994e305ea4eee.tar.bz2 | |
dependencies/zlib: Add system zlib method for android
The same method that the BSDs use should also work for android. Also
update the tests and docs where appropriate.
| -rw-r--r-- | docs/markdown/Dependencies.md | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 | ||||
| -rw-r--r-- | test cases/common/221 zlib/meson.build | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index db8623a..86084ea 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -711,7 +711,7 @@ $ wx-config --libs std stc ## Zlib Zlib ships with pkg-config and cmake support, but on some operating -systems (windows, macOs, FreeBSD, dragonflybsd), it is provided as +systems (windows, macOs, FreeBSD, dragonflybsd, android), it is provided as part of the base operating system without pkg-config support. The new System finder can be used on these OSes to link with the bundled version. diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 0df8685..016cf92 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -466,7 +466,7 @@ class ZlibSystemDependency(SystemDependency): # I'm not sure this is entirely correct. What if we're cross compiling # from something to macOS? if ((m.is_darwin() and isinstance(self.clib_compiler, (AppleClangCCompiler, AppleClangCPPCompiler))) or - m.is_freebsd() or m.is_dragonflybsd()): + m.is_freebsd() or m.is_dragonflybsd() or m.is_android()): # No need to set includes, # on macos xcode/clang will do that for us. # on freebsd zlib.h is in /usr/include @@ -474,7 +474,7 @@ class ZlibSystemDependency(SystemDependency): self.is_found = True self.link_args = ['-lz'] elif m.is_windows(): - # Without a clib_compiler we can't find zlib, s just give up. + # Without a clib_compiler we can't find zlib, so just give up. if self.clib_compiler is None: self.is_found = False return diff --git a/test cases/common/221 zlib/meson.build b/test cases/common/221 zlib/meson.build index c53f71e..b5b813c 100644 --- a/test cases/common/221 zlib/meson.build +++ b/test cases/common/221 zlib/meson.build @@ -1,7 +1,7 @@ project('zlib system dependency', 'c') -if not ['darwin', 'freebsd', 'dragonfly', 'windows'].contains(host_machine.system()) - error('MESON_SKIP_TEST only applicable on macOS, FreeBSD, DragonflyBSD, and Windows.') +if not ['darwin', 'freebsd', 'dragonfly', 'windows', 'android'].contains(host_machine.system()) + error('MESON_SKIP_TEST only applicable on macOS, FreeBSD, DragonflyBSD, Windows, and Android.') endif cc = meson.get_compiler('c') |