diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2020-07-16 22:31:21 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-07-18 12:35:21 +0200 |
| commit | d10cd52406b6adf41a86a3452efd57dee4876825 (patch) | |
| tree | f4073c215e172b1a42226fb659811c6869f5689e | |
| parent | ae5b6deb15a42d483a256d095e18fc9518d7153f (diff) | |
| download | curl-d10cd52406b6adf41a86a3452efd57dee4876825.tar.gz | |
travis: update quiche builds for new boringssl layout
This is required after https://github.com/cloudflare/quiche/pull/593
moved BoringSSL around slightly.
This also means that Go is not needed to build BoringSSL anymore (the
one provided by quiche anyway).
Closes #5691
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | docs/HTTP3.md | 6 | ||||
| -rwxr-xr-x | scripts/travis/before_script.sh | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 4a2c9ba4f..0150d69a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,10 +101,8 @@ jobs: before_install: - eval "$(gimme stable)"; gimme --list # Install latest Go (for boringssl) - env: - - T=novalgrind QUICHE="yes" C="--with-ssl=$HOME/quiche/deps/boringssl --with-quiche=$HOME/quiche/target/release --enable-alt-svc" LD_LIBRARY_PATH=$HOME/quiche/target/release:/usr/local/lib + - T=novalgrind QUICHE="yes" C="--with-ssl=$HOME/quiche/deps/boringssl/src --with-quiche=$HOME/quiche/target/release --enable-alt-svc" LD_LIBRARY_PATH=$HOME/quiche/target/release:/usr/local/lib - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - before_install: - - eval "$(gimme stable)"; gimme --list # Install latest Go (for boringssl) addons: apt: <<: *common_apt diff --git a/docs/HTTP3.md b/docs/HTTP3.md index e54e5d028..44381ae10 100644 --- a/docs/HTTP3.md +++ b/docs/HTTP3.md @@ -117,8 +117,8 @@ Build quiche and BoringSSL: % git clone --recursive https://github.com/cloudflare/quiche % cd quiche % cargo build --release --features pkg-config-meta,qlog - % mkdir deps/boringssl/lib - % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/lib/ + % mkdir deps/boringssl/src/lib + % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/src/lib/ Build curl: @@ -126,7 +126,7 @@ Build curl: % git clone https://github.com/curl/curl % cd curl % ./buildconf - % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-ssl=$PWD/../quiche/deps/boringssl --with-quiche=$PWD/../quiche/target/release --enable-alt-svc + % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-ssl=$PWD/../quiche/deps/boringssl/src --with-quiche=$PWD/../quiche/target/release --enable-alt-svc % make ## Run diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index a2551ac06..bcc8cd4e1 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -96,8 +96,8 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then source $HOME/.cargo/env cd $HOME/quiche cargo build -v --release --features pkg-config-meta,qlog - mkdir -v deps/boringssl/lib - ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/lib/ + mkdir -v deps/boringssl/src/lib + ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/src/lib/ fi # Install common libraries. |