CI: remove unnecessary OpenSSL 3 option enable-tls1_3

.. and switch OpenSSL 3 libdir from lib64 to lib for consistency.

Closes https://github.com/curl/curl/pull/12758
This commit is contained in:
Stefan Eissing 2024-01-22 17:31:25 +01:00 committed by Jay Satiro
parent 5f437ef3ca
commit 5125ddbb10

View File

@ -105,19 +105,19 @@ jobs:
- name: openssl3 - name: openssl3
install_packages: zlib1g-dev valgrind install_packages: zlib1g-dev valgrind
install_steps: gcc-11 openssl3 pytest install_steps: gcc-11 openssl3 pytest
configure: CFLAGS=-std=gnu89 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib64" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets configure: CFLAGS=-std=gnu89 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets
singleuse: --unit singleuse: --unit
- name: openssl3-O3 - name: openssl3-O3
install_packages: zlib1g-dev valgrind install_packages: zlib1g-dev valgrind
install_steps: gcc-11 openssl3 install_steps: gcc-11 openssl3
configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib64" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets
singleuse: --unit singleuse: --unit
- name: openssl3-clang - name: openssl3-clang
install_packages: zlib1g-dev clang install_packages: zlib1g-dev clang
install_steps: openssl3 install_steps: openssl3
configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib64" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets
singleuse: --unit singleuse: --unit
- name: address-sanitizer - name: address-sanitizer
@ -279,7 +279,7 @@ jobs:
run: | run: |
git clone --quiet --depth=1 -b ${{ env.openssl3-version }} https://github.com/openssl/openssl git clone --quiet --depth=1 -b ${{ env.openssl3-version }} https://github.com/openssl/openssl
cd openssl cd openssl
./config enable-tls1_3 --prefix=$HOME/openssl3 ./config --prefix=$HOME/openssl3 --libdir=$HOME/openssl3/lib
make -j1 install_sw make -j1 install_sw
- name: cache quictls - name: cache quictls
@ -297,7 +297,7 @@ jobs:
run: | run: |
git clone --quiet --depth=1 -b openssl-${{ env.quictls-version }} https://github.com/quictls/openssl git clone --quiet --depth=1 -b openssl-${{ env.quictls-version }} https://github.com/quictls/openssl
cd openssl cd openssl
./config enable-tls1_3 --prefix=$HOME/quictls --libdir=$HOME/quictls/lib ./config --prefix=$HOME/quictls --libdir=$HOME/quictls/lib
make -j1 install_sw make -j1 install_sw
- name: cache msh3 - name: cache msh3