Skip to content

Commit 159c076

Browse files
committed
fix aarch64 build
1 parent a2a10f6 commit 159c076

File tree

1 file changed

+10
-24
lines changed

1 file changed

+10
-24
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
path: release/
6666

6767
linux-aarch64:
68-
runs-on: ubuntu-latest
68+
runs-on: ubuntu-24.04-arm
6969
steps:
7070
- name: Checkout
7171
uses: actions/checkout@v4
@@ -91,42 +91,28 @@ jobs:
9191
EOF
9292
patch -p1 < /tmp/ffmpeg8.patch
9393
94-
- name: Setup ARM64 cross-compilation
94+
- name: Install build dependencies
9595
run: |
96-
sudo dpkg --add-architecture arm64
9796
sudo apt-get update
9897
sudo apt-get install -y \
9998
build-essential git autotools-dev autoconf automake libtool gettext gawk gperf \
100-
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu pkg-config bison flex
101-
102-
- name: Install ARM64 libraries
103-
run: |
104-
sudo apt-get install -y \
105-
libconfuse-dev:arm64 libunistring-dev:arm64 \
106-
libavcodec-dev:arm64 libavformat-dev:arm64 libavfilter-dev:arm64 libswscale-dev:arm64 libavutil-dev:arm64 \
107-
libasound2-dev:arm64 libxml2-dev:arm64 libgcrypt20-dev:arm64 zlib1g-dev:arm64 \
108-
libevent-dev:arm64 libplist-dev:arm64 libsodium-dev:arm64 libjson-c-dev:arm64 \
109-
libcurl4-openssl-dev:arm64 libprotobuf-c-dev:arm64
99+
libconfuse-dev libunistring-dev \
100+
libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev \
101+
libasound2-dev libxml2-dev libgcrypt20-dev zlib1g-dev \
102+
libevent-dev libplist-dev libsodium-dev libjson-c-dev \
103+
libcurl4-openssl-dev libprotobuf-c-dev pkg-config bison flex
110104
111105
- name: Build for ARM64
112106
run: |
113-
# Set up cross-compilation environment
114-
export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
115-
export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
116-
117107
autoreconf -fi
118-
./configure --host=aarch64-linux-gnu \
119-
CC=aarch64-linux-gnu-gcc \
120-
CXX=aarch64-linux-gnu-g++ \
121-
PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
122-
PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
108+
./configure
123109
make -j$(nproc)
124110
mkdir -p release
125111
cp src/cliap2 release/cliap2-linux-aarch64
126112
chmod +x release/cliap2-linux-aarch64
127-
# Show file type
113+
# Show file type and dependencies
128114
file release/cliap2-linux-aarch64
129-
aarch64-linux-gnu-readelf -d src/cliap2 | grep NEEDED || true
115+
ldd release/cliap2-linux-aarch64
130116
131117
- name: Upload artifacts
132118
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)