github: Adapt to switch to Ubuntu 24.04 for ubuntu-latest
This commit is contained in:
+7
-3
@@ -173,7 +173,7 @@ system_uses_openssl3()
|
||||
|
||||
prepare_system_openssl()
|
||||
{
|
||||
# On systems that ship OpenSSL 3 (e.g. Ubuntu 22.04), we require debug
|
||||
# On systems that ship OpenSSL 3 (e.g. Ubuntu 22.04+), we require debug
|
||||
# symbols to whitelist leaks
|
||||
if test "$1" = "deps"; then
|
||||
echo "deb http://ddebs.ubuntu.com $(lsb_release -cs) main restricted
|
||||
@@ -181,13 +181,17 @@ prepare_system_openssl()
|
||||
deb http://ddebs.ubuntu.com $(lsb_release -cs)-proposed main restricted" | \
|
||||
sudo tee -a /etc/apt/sources.list.d/ddebs.list
|
||||
sudo apt-get install -qq ubuntu-dbgsym-keyring
|
||||
DEPS="$DEPS libssl3-dbgsym"
|
||||
if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "24.04" ]; then
|
||||
DEPS="$DEPS libssl3t64-dbgsym"
|
||||
else
|
||||
DEPS="$DEPS libssl3-dbgsym"
|
||||
fi
|
||||
fi
|
||||
if test "$LEAK_DETECTIVE" = "yes"; then
|
||||
# make sure we can properly whitelist functions with leak detective
|
||||
DEPS="$DEPS binutils-dev"
|
||||
CONFIG="$CONFIG --enable-bfd-backtraces"
|
||||
else
|
||||
elif [ "$ID" = "ubuntu" -a "$VERSION_ID" != "24.04" ]; then
|
||||
# with ASan we have to use the (extremely) slow stack unwind as the
|
||||
# shipped version of the library is built with -fomit-frame-pointer
|
||||
export ASAN_OPTIONS=fast_unwind_on_malloc=0
|
||||
|
||||
Reference in New Issue
Block a user