Use the Focal Clickable SDK for Ubuntu Touch builds
This commit is contained in:
1 parent
2f210aba03
commit
cfcba405c4
1 file changed
+4
-7
@@ -32,7 +32,7 @@ jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-24.04
|
||||
# The published focal channel must use Focal's ARM64 libc and libraries.
|
||||
container: ubuntu:20.04
|
||||
container: clickable/ci-20.04-arm64@sha256:c6227ffcdb2abb50101a8469dd2a8df3ffd9208e04a3e07e351db63d36bec5d6
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
@@ -55,9 +55,6 @@ jobs:
|
||||
- name: Install the Focal build environment
|
||||
run: |
|
||||
set -euo pipefail
|
||||
dpkg --add-architecture arm64
|
||||
sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list
|
||||
printf 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main universe\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main universe\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main universe\n' > /etc/apt/sources.list.d/ports-arm64.list
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
build-essential binutils-aarch64-linux-gnu ca-certificates ccache \
|
||||
@@ -101,7 +98,7 @@ jobs:
|
||||
export AARCH64_CC="$(command -v aarch64-linux-gnu-gcc)"
|
||||
export AARCH64_AR="$(command -v aarch64-linux-gnu-ar)"
|
||||
export AARCH64_RANLIB="$(command -v aarch64-linux-gnu-ranlib)"
|
||||
export AARCH64_PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
|
||||
export AARCH64_PKG_CONFIG_PATH=/opt/sdl/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
|
||||
export PKG_CONFIG_LIBDIR="$AARCH64_PKG_CONFIG_PATH"
|
||||
export AARCH64_RAY_SDL_CFLAGS="$(pkg-config --cflags sdl2)"
|
||||
export AARCH64_RAY_SDL_LDLIBS="$(pkg-config --libs sdl2)"
|
||||
@@ -109,8 +106,8 @@ jobs:
|
||||
export AARCH64_RAY_GL_LDLIBS="$(pkg-config --libs libdrm gbm egl glesv2)"
|
||||
export AARCH64_RAY_CFLAGS="$AARCH64_RAY_SDL_CFLAGS $AARCH64_RAY_GL_CFLAGS"
|
||||
export AARCH64_RAY_LDLIBS="$AARCH64_RAY_SDL_LDLIBS $AARCH64_RAY_GL_LDLIBS"
|
||||
export AARCH64_RAY_SDL_INCLUDE_DIR=/usr/include/SDL2
|
||||
export AARCH64_CLICK_RUNTIME_LIBS="/usr/lib/aarch64-linux-gnu/libSDL2-2.0.so.0 /usr/lib/aarch64-linux-gnu/libssl.so.1.1 /usr/lib/aarch64-linux-gnu/libcrypto.so.1.1 /usr/lib/aarch64-linux-gnu/libdrm.so.2 /usr/lib/aarch64-linux-gnu/libgbm.so.1 /usr/lib/aarch64-linux-gnu/libEGL.so.1 /usr/lib/aarch64-linux-gnu/libGLESv2.so.2 /usr/lib/aarch64-linux-gnu/libz.so.1"
|
||||
export AARCH64_RAY_SDL_INCLUDE_DIR="$(pkg-config --variable=includedir sdl2)/SDL2"
|
||||
export AARCH64_CLICK_RUNTIME_LIBS="$(pkg-config --variable=libdir sdl2)/libSDL2-2.0.so.0 /usr/lib/aarch64-linux-gnu/libssl.so.1.1 /usr/lib/aarch64-linux-gnu/libcrypto.so.1.1 /usr/lib/aarch64-linux-gnu/libdrm.so.2 /usr/lib/aarch64-linux-gnu/libgbm.so.1 /usr/lib/aarch64-linux-gnu/libEGL.so.1 /usr/lib/aarch64-linux-gnu/libGLESv2.so.2 /usr/lib/aarch64-linux-gnu/libz.so.1"
|
||||
make CLICK_ARCH=arm64 click
|
||||
python3 scripts/check-click-abi.py build/dist/click/*.click
|
||||
|
||||
|
||||
Reference in new issue
Block a user