Skip to content

Commit 7bbef42

Browse files
authored
Merge pull request #6631 from BOINC/vko_fix_vcpkg_build
[ci] fix build errors
2 parents a19b5dd + 4f3e51c commit 7bbef42

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/linux-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- name: Install dependencies
8787
run: |
8888
apt-get -qq update
89-
apt-get install -y autopoint make build-essential m4 pkg-config autoconf libtool git python3 python3-distutils python3-jinja2 curl zip unzip tar bison p7zip-full dbus
89+
apt-get install -y autopoint make build-essential m4 pkg-config autoconf autoconf-archive libtool git python3 python3-distutils python3-jinja2 curl zip unzip tar bison p7zip-full dbus
9090
9191
- name: Install dependencies for arm64
9292
if: matrix.arch == 'arm64'

.github/workflows/linux.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Install dependencies for x64
7878
if: success() && (! endsWith(matrix.type, 'arm64') && (matrix.type != 'coverity' || (github.ref == 'refs/heads/master' && github.event_name == 'schedule')))
7979
run: |
80-
sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.1-dev libxxf86vm-dev ocl-icd-opencl-dev libltdl-dev libzip-dev nlohmann-json3-dev
80+
sudo apt-get install -y autoconf-archive libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.1-dev libxxf86vm-dev ocl-icd-opencl-dev libltdl-dev libzip-dev nlohmann-json3-dev
8181
8282
- name: Install dependencies for manager
8383
if: success() && (matrix.type == 'manager' || (matrix.type == 'coverity' && github.ref == 'refs/heads/master' && github.event_name == 'schedule'))
@@ -90,7 +90,7 @@ jobs:
9090
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
9191
9292
- name: Fix sources for arm64
93-
if: success() && endsWith(matrix.type, 'arm64')
93+
if: success() && endsWith(matrix.type, 'arm64') && matrix.type != 'client-vcpkg-arm64'
9494
run: |
9595
arch=arm64
9696
sudo dpkg --add-architecture arm64
@@ -136,7 +136,8 @@ jobs:
136136
run: |
137137
sudo apt install -y \
138138
libltdl-dev:arm64 \
139-
python3-jinja2
139+
python3-jinja2 \
140+
autoconf-archive
140141
141142
- name: Install dependencies for unit testing
142143
if: success() && matrix.type == 'unit-test'

snap/snapcraft.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ parts:
6666
- libdbus-1-dev
6767
- libxtst-dev
6868
# vcpkg dependencies
69+
- autoconf-archive
6970
- build-essential
7071
- pkg-config
7172
- tar

0 commit comments

Comments
 (0)