diff options
| author | Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com> | 2023-11-03 12:12:48 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 12:12:48 +0900 |
| commit | 71f5d1be5f1644cd4b4a6a9f266e6c5ae935dfa2 (patch) | |
| tree | 6456f34c314d15801c25f635f2a274c782054901 | |
| parent | d066c72a0d5973eff914138b199237ddcec17047 (diff) | |
| parent | 7a490fe497645b6cc5cc872b197ffb41e278e0f8 (diff) | |
Merge pull request #2129 from aria2/fix-non-bt-build-error
Fix non bt build error
| -rw-r--r-- | .github/workflows/build.yml | 13 | ||||
| -rw-r--r-- | src/DefaultBtProgressInfoFile.cc | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c205a0c..d51fc84d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | diff --git a/src/DefaultBtProgressInfoFile.cc b/src/DefaultBtProgressInfoFile.cc index 9d03e3e9..7907284f 100644 --- a/src/DefaultBtProgressInfoFile.cc +++ b/src/DefaultBtProgressInfoFile.cc @@ -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" |