diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-11-03 14:07:23 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-11-03 14:07:23 +0100 |
| commit | e988806460f8a3f0aa2f3886b19aa2c02b6300b7 (patch) | |
| tree | 015c0446b9be20a5a3b3e8b78078104ebc067e02 | |
| parent | 45a7821eefc564d0da100dafbe26d1fd61134fa9 (diff) | |
| download | curl-e988806460f8a3f0aa2f3886b19aa2c02b6300b7.tar.gz | |
zuul: build quiche with BoringSSL built separately
... in an attempt to avoid BoringSSL using cmake --parallel because
that's an option that doesn't exist in the cmake shipped in Ubuntu
Bionic, which is a system commonly used in our CI systems.
Fixes #7927
| -rwxr-xr-x | scripts/zuul/before_script.sh | 4 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh index 79bdb04b5..d2e5cedc8 100755 --- a/scripts/zuul/before_script.sh +++ b/scripts/zuul/before_script.sh @@ -120,9 +120,7 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then curl https://sh.rustup.rs -sSf | sh -s -- -y source $HOME/.cargo/env cd $HOME/quiche - cargo build -v --release --features ffi,pkg-config-meta,qlog - mkdir -v deps/boringssl/src/lib - ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/src/lib/ + QUICHE_BSSL_PATH=$HOME/boringssl cargo build -v --release --features ffi,pkg-config-meta,qlog fi if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 0ad83cf8b..ee4f648c6 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -115,9 +115,10 @@ CC: gcc-8 CXX: g++-8 T: novalgrind + BORINGSSL: "yes" QUICHE: "yes" C: >- - --with-openssl={{ ansible_user_dir }}/quiche/deps/boringssl/src + --with-openssl={{ ansible_user_dir }}/boringssl --with-quiche={{ ansible_user_dir }}/quiche/target/release LD_LIBRARY_PATH: "{{ ansible_user_dir }}/quiche/target/release:/usr/local/lib" |