Skip to content

Commit

Permalink
curl.sh: drop CMAKE_LIBRARY_PATH hack for curl source having the fi…
Browse files Browse the repository at this point in the history
…x [ci skip]

Pending curl/curl#14905 expected in curl 8.11.0.

`CMAKE_LIBRARY_PATH` kept for 8.10.0 and 8.10.1 if it doesn't have
the fix. This keeps it for all 8.10.1 branch except the PR to allow
testing it.
  • Loading branch information
vszakats committed Sep 14, 2024
1 parent 69ec033 commit 805a5ad
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,10 @@ _VER="$1"
options+=' -DUSE_NGTCP2=ON'
options+=" -DNGTCP2_INCLUDE_DIR=${_TOP}/ngtcp2/${_PPS}/include"
options+=" -DNGTCP2_LIBRARY=${_TOP}/ngtcp2/${_PPS}/lib/libngtcp2.a"
options+=" -DCMAKE_LIBRARY_PATH=${_TOP}/ngtcp2/${_PPS}/lib" # FIXME: upstream, this hack should not be necessary
if ! grep -q -F get_filename_component CMake/FindNGTCP2.cmake || \
[ "${CURL_VER_}" = '8.10.0' ]; then
options+=" -DCMAKE_LIBRARY_PATH=${_TOP}/ngtcp2/${_PPS}/lib" # Pending: https://github.com/curl/curl/pull/14905
fi
CPPFLAGS+=' -DNGTCP2_STATICLIB'
else
options+=' -DUSE_NGTCP2=OFF'
Expand Down

0 comments on commit 805a5ad

Please sign in to comment.