From 80fac03bd1976467b1edd16aa0b5f9477b5216bd Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 16:48:07 +0300 Subject: [PATCH 1/2] add linux_cross-shstk --- docker/linux_cross-shstk/Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 docker/linux_cross-shstk/Dockerfile diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile new file mode 100644 index 0000000..3bf0e1a --- /dev/null +++ b/docker/linux_cross-shstk/Dockerfile @@ -0,0 +1,24 @@ +ARG DOCKER_PREFIX=wapmobil/ +ARG IMAGE_FROM +FROM ${DOCKER_PREFIX}${IMAGE_FROM} + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git + +WORKDIR /soft/shstk_build_host +RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && rm -rf * \ + && ldconfig + +WORKDIR /soft/shstk_build +RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ + && cmake --build ./ --target install -j${JOBS_COUNT} \ + && cmake --build ./ --target deploy -j${JOBS_COUNT} \ + && rm -rf * + +WORKDIR /soft/src From 7cc8b3cb75290f9deb061dbf907017b13609b842 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 7 Sep 2023 16:51:27 +0300 Subject: [PATCH 2/2] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 43a9d8b..6c0de52 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 43a9d8be6f3c769065242e51aa28db9a4b9426b2 +Subproject commit 6c0de521801a3f5e2707cb8e36e132f1ca7568d7