Skip to content

autoconf: Add lib flags for the quiche build test. #9679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bneradt merged 2 commits into from
May 15, 2023
Merged

autoconf: Add lib flags for the quiche build test. #9679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740f56f
autoconf: Set "other-libraries"(with needed "-lssl -lcrypto") argumen…
brbzull0 May 4, 2023
20cbc7e
quiche build, use full path for boringssl
brbzull0 May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/quiche.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if test "$has_quiche" != "0"; then
TS_ADDTO_RPATH(${quiche_ldflags})
fi

AC_CHECK_LIB([quiche], quiche_connect, [quiche_have_libs=1])
AC_CHECK_LIB([quiche], quiche_connect, [quiche_have_libs=1], [], [$OPENSSL_LIBS])
if test "$quiche_have_libs" != "0"; then
AC_CHECK_HEADERS(quiche.h, [quiche_have_headers=1])
fi
Expand All @@ -80,7 +80,7 @@ fi
],
[
AC_CHECK_HEADER([quiche.h], [], [has_quiche=0])
AC_CHECK_LIB([quiche], quiche_connect, [:], [has_quiche=0])
AC_CHECK_LIB([quiche], quiche_connect, [:], [has_quiche=0], [$OPENSSL_LIBS])
])

AM_CONDITIONAL([USE_QUICHE], [test $has_quiche -eq 1])
Expand Down
8 changes: 7 additions & 1 deletion tools/build_h3_tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ LDFLAGS=${LDFLAGS:-"-Wl,-rpath,${OPENSSL_PREFIX}/lib"}

if [ -e /etc/redhat-release ]; then
MAKE="gmake"
TMP_QUICHE_BSSL_PATH="${BASE}/boringssl/lib64"
echo "+-------------------------------------------------------------------------+"
echo "| You probably need to run this, or something like this, for your system: |"
echo "| |"
Expand All @@ -50,6 +51,7 @@ if [ -e /etc/redhat-release ]; then
echo
echo
elif [ -e /etc/debian_version ]; then
TMP_QUICHE_BSSL_PATH="${BASE}/boringssl/lib"
echo "+-------------------------------------------------------------------------+"
echo "| You probably need to run this, or something like this, for your system: |"
echo "| |"
Expand All @@ -63,6 +65,10 @@ elif [ -e /etc/debian_version ]; then
echo
fi

if [ -z ${QUICHE_BSSL_PATH+x} ]; then
QUICHE_BSSL_PATH=${TMP_QUICHE_BSSL_PATH:-"${BASE}/boringssl/lib"}
fi

set -x
if [ `uname -s` = "Linux" ]
then
Expand Down Expand Up @@ -122,7 +128,7 @@ echo "Building quiche"
QUICHE_BASE="${BASE:-/opt}/quiche"
[ ! -d quiche ] && git clone --recursive https://github.com/cloudflare/quiche.git
cd quiche
QUICHE_BSSL_PATH=${BASE}/boringssl QUICHE_BSSL_LINK_KIND=dylib cargo build -j4 --package quiche --release --features ffi,pkg-config-meta,qlog
QUICHE_BSSL_PATH=${QUICHE_BSSL_PATH} QUICHE_BSSL_LINK_KIND=dylib cargo build -j4 --package quiche --release --features ffi,pkg-config-meta,qlog
sudo mkdir -p ${QUICHE_BASE}/lib/pkgconfig
sudo mkdir -p ${QUICHE_BASE}/include
sudo cp target/release/libquiche.a ${QUICHE_BASE}/lib/
Expand Down