diff --git a/system-images/android/sdk/Dockerfile b/system-images/android/sdk/Dockerfile index d86d963..4241501 100644 --- a/system-images/android/sdk/Dockerfile +++ b/system-images/android/sdk/Dockerfile @@ -1,42 +1,47 @@ # https://github.com/rabits/dockerfiles/blob/master/5.10-android/Dockerfile FROM rabits/qt:5.10-android LABEL Description="KDE Android SDK" MAINTAINER Aleix Pol Gonzalez USER root RUN apt-get -qq update && apt-get install -qq \ - cmake cmake-curses-gui \ libxml-simple-perl \ libjson-perl \ ninja-build \ build-essential \ gperf gettext \ python3 python3-paramiko python3-lxml python3-yaml \ bison flex \ ruby wget \ && apt-get -qq clean COPY build-qt build-cmake-native build-cmake /opt/helpers/ RUN chmod a+w /opt/ USER user RUN mkdir /opt/kdeandroid-deps RUN mkdir /opt/nativetooling ENV ANDROID_NDK $ANDROID_NDK_ROOT COPY gitconfig $HOME/.gitconfig +RUN mkdir -p /opt/cmake \ + && curl -Lo /tmp/cmake.sh https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.sh \ + && bash /tmp/cmake.sh --skip-license --prefix=/opt/cmake --exclude-subdir \ + && rm /tmp/cmake.sh +ENV PATH="/opt/cmake/bin:${PATH}" + # pull some generally required deps RUN GIT_EXTRA="--single-branch --branch 5.10" /opt/helpers/build-qt qtscript git://code.qt.io/qt/qtscript.git RUN /opt/helpers/build-cmake-native extra-cmake-modules kde:extra-cmake-modules -DCMAKE_INSTALL_PREFIX=/opt/kdeandroid-deps -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps" RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git # compile kf5 tooling RUN cd && git clone git://code.qt.io/qt/qtbase.git --single-branch --branch 5.10 && cd qtbase \ && QMAKESPEC= ./configure -prefix /opt/nativetooling -opensource -confirm-license -no-gui -release -optimize-size -nomake tests -nomake examples -no-feature-concurrent \ && QMAKESPEC= make -j4 && QMAKESPEC= make install && rm -rf ~/qtbase RUN /opt/helpers/build-cmake-native kconfig kde:kconfig -DCMAKE_INSTALL_PREFIX=/opt/nativetooling -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=/opt/kdeandroid-deps/ -DBUILD_TESTING=OFF -DQt5_DIR=/opt/nativetooling/lib/cmake/Qt5 -DKCONFIG_USE_GUI=OFF RUN /opt/helpers/build-cmake-native kcoreaddons kde:kcoreaddons -DCMAKE_INSTALL_PREFIX=/opt/nativetooling -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=/opt/kdeandroid-deps/ -DBUILD_TESTING=OFF -DQt5Core_DIR=/opt/nativetooling/lib/cmake/Qt5Core -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON COPY build-generic build-eigen target-from-manifest.py /opt/helpers/