Skip to content

Commit

Permalink
Update README on how to build on Debian 8
Browse files Browse the repository at this point in the history
+ typo fixes
  • Loading branch information
mossroy committed Apr 24, 2017
1 parent ff97a67 commit 6b014fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ of kiwix.
Most of the compilation steps are handled by the kiwix-build.py
script.

This script has been tested of Fedora 23 and Ubuntu 16.10
This script has been tested on Fedora 23 and Ubuntu 16.10

If you want to cross-compile for other platforms as windows or android, you
should read the "Other target platform" section.

This script is not officially supported on Debian 8, but has been reported to work, after adding ~/.local/bin to the PATH.

## Preparing environment

You will need a recent version of meson (0.34) and ninja (1.6)
Expand All @@ -28,14 +30,16 @@ them with your package manager.
Else you can install them manually

### Meson
You need to install python 3 and pip. On debian and ubuntu, they are provided by the package python3-pip

```
pip install meson --user # Install Meson
pip3 install meson --user # Install Meson
```

(You may want to install meson in a virtualenv if you prefer)

### ninja
You need git to be installed

```
git clone git://github.com/ninja-build/ninja.git
Expand All @@ -54,10 +58,10 @@ This is the simple one.
```

It will compile everything.
If you are using a supported platform (redhad or debian based) it will install
If you are using a supported platform (redhat or debian based) it will install
missing packages using sudo.
If you don't want to trust kiwix-build.py and give it the root right, just
launch yourself the the printed command.
launch yourself the printed command.

### Outputs

Expand Down
6 changes: 3 additions & 3 deletions kiwix-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@
'COMMON': ['gcc-c++', 'cmake', 'automake', 'ccache', 'java-1.8.0-openjdk-devel']
},
'debian_native_dyn': {
'COMMON': ['automake', 'gcc', 'cmake', 'libbz2-dev', 'ccache'],
'COMMON': ['automake', 'gcc', 'cmake', 'libbz2-dev', 'ccache', 'pkg-config'],
'zlib': ['zlib1g-dev'],
'uuid': ['uuid-dev'],
'ctpp2': ['libctpp2-dev'],
'libmicrohttpd': ['libmicrohttpd-dev', 'ccache']
},
'debian_native_static': {
'COMMON': ['automake', 'gcc', 'cmake', 'libbz2-dev', 'ccache'],
'COMMON': ['automake', 'gcc', 'cmake', 'libbz2-dev', 'ccache', 'pkg-config'],
'zlib': ['zlib1g-dev'],
'uuid': ['uuid-dev'],
'ctpp2': ['libctpp2-dev'],
Expand Down Expand Up @@ -203,7 +203,7 @@ def __init__(self, options, targetsDict):
sys.exit("ERROR: ninja command not found")
self.meson_command = self._detect_meson()
if not self.meson_command:
sys.exit("ERROR: meson command not fount")
sys.exit("ERROR: meson command not found")
self.setup_build(options.target_platform)
self.setup_toolchains()
self.options = options
Expand Down

0 comments on commit 6b014fb

Please sign in to comment.