Bugfix
This commit is contained in:
parent
eb712d6c21
commit
f7165ee6b3
|
@ -8,26 +8,22 @@ if [ -z "${CPU_ARCH_DPKG}" ]; then
|
|||
echo "Missing parameter: CPU_ARCH_DPKG"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${CROSS_BUILD_DEPS_DIR}" ]; then
|
||||
echo "Missing parameter: CROSS_BUILD_DEPS_DIR"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CROSS_OPENJDK_PATH=""
|
||||
fix_jdk_path() {
|
||||
if [ -n "${CROSS_BUILD_DEPS_DIR}" ]; then
|
||||
CROSS_OPENJDK_PATH=""
|
||||
fix_jdk_path() {
|
||||
# Setup OpenJDK path
|
||||
CROSS_OPENJDK_PATH=$(find "$CROSS_BUILD_DEPS_DIR/usr/lib/jvm/" -maxdepth 1 -type d -iname "java*jdk*" | head -n 1)
|
||||
}
|
||||
}
|
||||
|
||||
check_jdk_existance() {
|
||||
check_jdk_existance() {
|
||||
if [[ ! -d "$CROSS_OPENJDK_PATH" ]]; then
|
||||
echo "Can't find cross OpenJDK at location $CROSS_OPENJDK_PATH"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
}
|
||||
|
||||
PWD_BEFORE_CROSS_DEPS=$(pwd)
|
||||
if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
|
||||
PWD_BEFORE_CROSS_DEPS=$(pwd)
|
||||
if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
|
||||
rm -rf "$CROSS_BUILD_DEPS_DIR" || true
|
||||
mkdir -p "$CROSS_BUILD_DEPS_DIR"
|
||||
cd "$CROSS_BUILD_DEPS_DIR"
|
||||
|
@ -90,11 +86,12 @@ if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
|
|||
check_jdk_existance
|
||||
|
||||
touch "$CROSS_BUILD_DEPS_DIR/ok-012"
|
||||
fi
|
||||
fix_jdk_path
|
||||
check_jdk_existance
|
||||
cd "${PWD_BEFORE_CROSS_DEPS}"
|
||||
apt install -y "crossbuild-essential-${CPU_ARCH_DPKG}"
|
||||
fi
|
||||
fix_jdk_path
|
||||
check_jdk_existance
|
||||
cd "${PWD_BEFORE_CROSS_DEPS}"
|
||||
|
||||
source ./scripts/continuous-integration/github-workflows/install-dependencies.sh
|
||||
sudo apt install -y "crossbuild-essential-${CPU_ARCH_DPKG}"
|
||||
source ./scripts/continuous-integration/github-workflows/build-natives.sh
|
||||
|
|
Loading…
Reference in New Issue