update
This commit is contained in:
parent
40816c0dee
commit
baebc5b1de
12
.github/workflows/platform_natives.yaml
vendored
12
.github/workflows/platform_natives.yaml
vendored
@ -125,13 +125,13 @@ jobs:
|
||||
if: matrix.os == 'ubuntu-20.04'
|
||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
with:
|
||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-dev libc++abi-dev ccache maven
|
||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev ccache maven
|
||||
version: 1.0
|
||||
- name: Install ubuntu 22.04 dependencies
|
||||
if: matrix.os == 'ubuntu-22.04'
|
||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
with:
|
||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-dev libc++abi-dev ccache maven
|
||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev ccache maven
|
||||
version: 1.0
|
||||
- name: Install MSVC
|
||||
if: matrix.os == 'windows-2019'
|
||||
@ -169,6 +169,14 @@ jobs:
|
||||
run: |
|
||||
$VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static
|
||||
shell: bash
|
||||
- name: Install deps
|
||||
shell: bash
|
||||
run: |
|
||||
echo "REVISION: $REVISION"
|
||||
|
||||
if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then
|
||||
source ./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh
|
||||
fi
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: |
|
||||
|
14
.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh
vendored
Executable file
14
.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh
vendored
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash -ex
|
||||
# Ubuntu 20.04
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
dpkg --add-architecture arm64
|
||||
sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list
|
||||
echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list
|
||||
echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list
|
||||
echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list
|
||||
|
||||
apt-get --assume-yes update
|
||||
apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64
|
||||
|
@ -1,7 +1,7 @@
|
||||
SET(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
set(triple aarch64-linux-gnu)
|
||||
set(CMAKE_SYSROOT /usr/aarch64-linux-gnu)
|
||||
#set(CMAKE_SYSROOT /usr/aarch64-linux-gnu)
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu)
|
||||
|
||||
set(CMAKE_C_COMPILER /usr/bin/clang-10)
|
||||
@ -26,7 +26,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
# Optionally reduce compiler sanity check when cross-compiling.
|
||||
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||
|
||||
#include_directories("${CROSS_OPENJDK_PATH}/include")
|
||||
include_directories("/usr/lib/llvm-10/include")
|
||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user