diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2017-12-05 00:12:30 +0100 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-12-04 15:12:30 -0800 |
| commit | 382c19767500a5fa7669fb8d6fdfbbdd1c404538 (patch) | |
| tree | 34ea56bb3a9660aef63c3d6f80614449a28e7590 | |
| parent | 5883c5ff2f4e892b5c6060f6fa500629ac7f5d9c (diff) | |
| download | navit-382c19767500a5fa7669fb8d6fdfbbdd1c404538.tar.gz | |
fix:ci:Install imagemagick for android build to convert images (#384)
* Update setup_android.sh
* Update setup_android.sh
* Update setup_common_requirements.sh
* Update setup_tomtom_requirements.sh
| -rw-r--r-- | ci/setup_common_requirements.sh | 2 | ||||
| -rw-r--r-- | ci/setup_tomtom_requirements.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/setup_common_requirements.sh b/ci/setup_common_requirements.sh index f5fa73cef..9f15dd6b1 100644 --- a/ci/setup_common_requirements.sh +++ b/ci/setup_common_requirements.sh @@ -1 +1 @@ -apt-get update && apt-get install -y wget unzip cmake build-essential gettext +apt-get update && apt-get install -y wget unzip cmake build-essential gettext imagemagick diff --git a/ci/setup_tomtom_requirements.sh b/ci/setup_tomtom_requirements.sh index 00bd33c44..98d6de3cd 100644 --- a/ci/setup_tomtom_requirements.sh +++ b/ci/setup_tomtom_requirements.sh @@ -4,7 +4,7 @@ set -e # install additional packages to build TT evitonment and navit -apt-get install -y libglib2.0-dev git autogen autoconf libtool imagemagick zip +apt-get install -y libglib2.0-dev git autogen autoconf libtool zip dpkg --add-architecture i386 apt-get update apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 |