tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Andrea Cavalli 2022-02-18 23:58:54 +01:00
parent 27b9859391
commit 89b3f04f0a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -27,8 +27,6 @@ ADD src /usr/src/tdlight-java-natives/src
WORKDIR /usr/src/tdlight-java-natives/ WORKDIR /usr/src/tdlight-java-natives/
ENV CROSS_BUILD_DEPS_DIR "/usr/src/tdlight-java-natives"
ENV JAVA_HOME="$(find "/usr/lib/jvm/" -maxdepth 1 -type d -iname "java*jdk*" | head -n 1)/" ENV JAVA_HOME="$(find "/usr/lib/jvm/" -maxdepth 1 -type d -iname "java*jdk*" | head -n 1)/"
ENV JAVA_INCLUDE_PATH="$JAVA_HOME/include" ENV JAVA_INCLUDE_PATH="$JAVA_HOME/include"

5
scripts/continuous-integration/docker/build-natives.sh
View File

@ -22,11 +22,10 @@ check_jdk_existance() {
fi fi
} }
fix_jdk_path
if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
rm -rf "$CROSS_BUILD_DEPS_DIR" || true rm -rf "$CROSS_BUILD_DEPS_DIR" || true
mkdir -p "$CROSS_BUILD_DEPS_DIR" mkdir -p "$CROSS_BUILD_DEPS_DIR"
cd "$CROSS_BUILD_DEPS_DIR" cd "$CROSS_BUILD_DEPS_DIR" || exit 1
# LibZ-Dev # LibZ-Dev
apt-get download "zlib1g-dev:${CPU_ARCH_DPKG}" apt-get download "zlib1g-dev:${CPU_ARCH_DPKG}"
ZLIB1G_DEV_DEB=$(find . -name "zlib1g-dev_*.deb") ZLIB1G_DEV_DEB=$(find . -name "zlib1g-dev_*.deb")
@ -83,7 +82,7 @@ if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
touch "$CROSS_BUILD_DEPS_DIR/ok-012" touch "$CROSS_BUILD_DEPS_DIR/ok-012"
fi fi
fix_jdk_path
check_jdk_existance check_jdk_existance
source ./scripts/continuous-integration/github-workflows/install-dependencies.sh source ./scripts/continuous-integration/github-workflows/install-dependencies.sh

2
scripts/core/setup-variables.sh
View File

@ -95,7 +95,7 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++" export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++"
fi fi
CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}/" CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}"
export CROSS_BUILD_DEPS_DIR export CROSS_BUILD_DEPS_DIR
fi fi