kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies.

Browse Source 
zlib and microhttpd are used by libkiwix, not kiwix-tools.

We indeed need libzim, but we use no feature related to xapian so no
need to mark it as mandatory.
(Libkiwix needs it and the check is there)
This commit is contained in:
Matthieu Gautier 2022-01-19 13:19:23 +01:00
parent 04ac15508f
commit 0ef85944b8
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -41,8 +41,8 @@ Dependencies
The Kiwix tools rely on a few third party software libraries. They are The Kiwix tools rely on a few third party software libraries. They are
prerequisites to the Kiwix tools compilation. Therefore, following prerequisites to the Kiwix tools compilation. Therefore, following
libraries need to be available: libraries need to be available:
* [Libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu) * [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
* [Zlib](https://www.zlib.net/) (package `zlib1g-dev` on Debian/Ubuntu) * [libzim](https://github.com/openzim/libzim) (package `libzim` on Debian/Ubuntu)
These dependencies may or may not be packaged by your operating These dependencies may or may not be packaged by your operating
system. They may also be packaged but only in an older version. They system. They may also be packaged but only in an older version. They

5
debian/control vendored
View File

@ -3,11 +3,10 @@ Section: utils
Priority: optional Priority: optional
Maintainer: Kiwix team <kiwix@kiwix.org> Maintainer: Kiwix team <kiwix@kiwix.org>
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
libkiwix-dev (>= 9.3.0~), libkiwix-dev (>= 10.0.0),
libmicrohttpd-dev, libzim-dev (>= 7.2.0),
meson, meson,
pkg-config, pkg-config,
zlib1g-dev
Standards-Version: 4.5.0 Standards-Version: 4.5.0
Homepage: https://github.com/kiwix/kiwix-tools Homepage: https://github.com/kiwix/kiwix-tools
Rules-Requires-Root: no Rules-Requires-Root: no

12
meson.build
View File

@ -12,17 +12,11 @@ if static_linkage
add_global_link_arguments('-static-libstdc++', '--static', language:'cpp') add_global_link_arguments('-static-libstdc++', '--static', language:'cpp')
endif endif
libzim_dep = dependency('libzim', version : '>=7.2.0', static:static_linkage)
if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
endif
thread_dep = dependency('threads') thread_dep = dependency('threads')
libkiwix_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage) kiwixlib_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage)
microhttpd_dep = dependency('libmicrohttpd', static:static_linkage) libzim_dep = dependency('libzim', version:'>=7.2.0', static:static_linkage)
z_dep = dependency('zlib', static:static_linkage)
all_deps = [thread_dep, libzim_dep, libkiwix_dep, microhttpd_dep, z_dep] all_deps = [thread_dep, kiwixlib_dep, libzim_dep]
if static_linkage if static_linkage
librt = compiler.find_library('rt', required:false) librt = compiler.find_library('rt', required:false)