Merge pull request #2129 from aria2/fix-non-bt-build-error

Fix non bt build error
pull/1558/merge
Tatsuhiro Tsujikawa 2023-11-03 12:12:48 +09:00 committed by GitHub
commit 71f5d1be5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -9,9 +9,12 @@ jobs:
os: [ubuntu-22.04, macos-11]
compiler: [gcc, clang]
crypto: [openssl, gnutls]
bittorrent: [with-bt, without-bt]
exclude:
- os: macos-11
crypto: gnutls
- crypto: openssl
bittorrent: without-bt
runs-on: ${{ matrix.os }}
@ -73,14 +76,20 @@ jobs:
echo 'CPPFLAGS='"$CPPFLAGS" >> $GITHUB_ENV
echo 'LDFLAGS='"$LDFLAGS" >> $GITHUB_ENV
- name: Disable BitTorrent
if: matrix.bittorrent == 'without-bt'
run: |
FEATURE_FLAGS="$FEATURE_FLAGS --disable-bittorrent"
echo 'FEATURE_FLAGS='"$FEATURE_FLAGS" >> $GITHUB_ENV
- name: Configure autotools (Linux, gnutls)
if: runner.os == 'Linux' && matrix.crypto == 'gnutls'
run: |
./configure --with-gnutls --without-openssl
./configure --with-gnutls --without-openssl $FEATURE_FLAGS
- name: Configure autotools (Linux, openssl)
if: runner.os == 'Linux' && matrix.crypto == 'openssl'
run: |
./configure --without-gnutls --with-openssl
./configure --without-gnutls --with-openssl $FEATURE_FLAGS
- name: Configure autotools (macOS)
if: runner.os == 'macOS'
run: |

View File

@ -57,6 +57,7 @@
#include "DownloadContext.h"
#include "BufferedFile.h"
#include "SHA1IOFile.h"
#include "BtConstants.h"
#ifdef ENABLE_BITTORRENT
# include "PeerStorage.h"
# include "BtRuntime.h"