...
 
Commits (2)
......@@ -125,7 +125,7 @@ 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.15/cmake-3.15.3-Linux-x86_64.sh \
&& curl -Lo /tmp/cmake.sh https://cmake.org/files/v3.16/cmake-3.16.4-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}"
......@@ -184,7 +184,7 @@ ENV QMAKESPEC android-clang
RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
COPY build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args \
target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount /opt/helpers/
target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch /opt/helpers/
RUN sed -i.bak 's/android:minSdkVersion="16"/android:minSdkVersion="21"/g' $QT_ANDROID/src/android/templates/AndroidManifest.xml \
&& sed -i.bak 's/|density//g' $QT_ANDROID/src/android/templates/AndroidManifest.xml
......
......@@ -184,7 +184,7 @@ ENV QMAKESPEC android-clang
RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
COPY build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args \
target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount /opt/helpers/
target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch /opt/helpers/
RUN sed -i.bak 's/android:minSdkVersion="16"/android:minSdkVersion="21"/g' $QT_ANDROID/src/android/templates/AndroidManifest.xml \
&& sed -i.bak 's/|density//g' $QT_ANDROID/src/android/templates/AndroidManifest.xml
......
......@@ -15,7 +15,7 @@ fi
cd discount
# discount executes a previously build executable during build. Therefore we need to build it natively first and then use the built executable to cross-compile
git apply 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch
git apply /opt/helpers/0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch
BUILD=build-native EXTRA_CMAKE_SUBDIR=cmake /opt/helpers/build-cmake-native discount https://github.com/Orc/discount -DDISCOUNT_ONLY_LIBRARY=On -DCMAKE_INSTALL_PREFIX=/opt/nativetooling
......