diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2020-05-10 16:53:00 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2020-05-22 21:10:07 +0200 |
| commit | 421171a8d4d8a59a02fa471d049280b33ea0e48a (patch) | |
| tree | e63213217b1fc089c15f0cec653f21cdfaa174ff | |
| parent | 06e266e0a5c877e692eab8a653a1ea47adfae43e (diff) | |
travis: simplify quiche build instructions wrt boringssl
quiche builds boringssl as static library, reuse that instead of
building another shared library.
Closes #5438
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | docs/HTTP3.md | 24 | ||||
| -rwxr-xr-x | scripts/travis/before_script.sh | 6 |
3 files changed, 10 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index 6f7e67bfb..3c149b877 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,7 +98,7 @@ jobs: before_install: - eval "$(gimme stable)"; gimme --list # Install latest Go (for boringssl) - env: - - T=novalgrind BORINGSSL=yes QUICHE="yes" C="--with-ssl=$HOME/boringssl --with-quiche=$HOME/quiche/target/release --enable-alt-svc" LD_LIBRARY_PATH=/home/travis/boringssl/lib:$HOME/quiche/target/release:/usr/local/lib + - 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 - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" before_install: - eval "$(gimme stable)"; gimme --list # Install latest Go (for boringssl) diff --git a/docs/HTTP3.md b/docs/HTTP3.md index e84f50021..051655f5c 100644 --- a/docs/HTTP3.md +++ b/docs/HTTP3.md @@ -112,26 +112,12 @@ Build curl ## build -Clone quiche and BoringSSL: +Build quiche and BoringSSL: % git clone --recursive https://github.com/cloudflare/quiche - -Build BoringSSL (it needs to be built manually so it can be reused with curl): - - % cd quiche/deps/boringssl - % mkdir build - % cd build - % cmake -DCMAKE_POSITION_INDEPENDENT_CODE=on .. - % make - % cd .. - % mkdir -p .openssl/lib - % cp build/crypto/libcrypto.a build/ssl/libssl.a .openssl/lib - % ln -s $PWD/include .openssl - -Build quiche: - - % cd ../.. - % QUICHE_BSSL_PATH=$PWD/deps/boringssl cargo build --release --features pkg-config-meta,qlog + % 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/ Build curl: @@ -139,7 +125,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/.openssl --with-quiche=$PWD/../quiche/target/release --enable-alt-svc + % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-ssl=$PWD/../quiche/deps/boringssl --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 28b563e2e..a2551ac06 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -91,11 +91,13 @@ fi if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then cd $HOME - git clone --depth=1 https://github.com/cloudflare/quiche.git + git clone --depth=1 --recursive https://github.com/cloudflare/quiche.git curl https://sh.rustup.rs -sSf | sh -s -- -y source $HOME/.cargo/env cd $HOME/quiche - QUICHE_BSSL_PATH=$HOME/boringssl cargo build -v --release --features pkg-config-meta,qlog + 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/ fi # Install common libraries. |