Skip to content

Commit

Permalink
android: find makedepend
Browse files Browse the repository at this point in the history
For some reason the Android CI build started failing with:
    makedepend: not found
when building OpenSSL.

Try to 'apt-get install' it in before_install.sh
via xutils-dev.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
  • Loading branch information
neolit123 committed Apr 30, 2018
1 parent 0ac2a30 commit d031bb9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packaging/android/android-build-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fi

# make sure we have the required commands installed
MISSING=
for i in git cmake autoconf libtool java ant wget unzip; do
for i in git cmake autoconf libtool java ant wget unzip makedepend; do
command -v $i >/dev/null ||
if [ $i = libtool ] ; then
MISSING="${MISSING}libtool-bin "
Expand Down
1 change: 0 additions & 1 deletion packaging/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ else
export JAVA_HOME=/usr
fi


# find qmake
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake
$QMAKE -query
Expand Down
2 changes: 1 addition & 1 deletion scripts/android/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ git describe
docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu /bin/sleep 60m
docker exec -t builder apt-get update
# subsurface android build dependencies
docker exec -t builder apt-get install -y git cmake autoconf libtool-bin openjdk-8-jdk-headless ant wget unzip python bzip2 pkg-config
docker exec -t builder apt-get install -y git cmake autoconf libtool-bin openjdk-8-jdk-headless ant wget unzip python bzip2 pkg-config xutils-dev
# Qt installer dependencies
docker exec -t builder apt-get install -y libx11-xcb1 libgl1-mesa-glx libglib2.0-0
# Inject cached 3pp's (if none exists in 3pp dir, we inject zero ones, and all is downloaded in the container)
Expand Down

0 comments on commit d031bb9

Please sign in to comment.