From b3c94225609e4b2f92cd3040fac3fb659359ecb8 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 6 Mar 2025 14:25:12 +0100 Subject: [PATCH] dnsdist: Update tasks.py for the new Quiche library installation path --- tasks.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tasks.py b/tasks.py index 96d3d00902..151fb3a3df 100644 --- a/tasks.py +++ b/tasks.py @@ -1,10 +1,7 @@ -from invoke import task -from invoke.exceptions import Failure, UnexpectedExit - -import json import os -import sys import time +from invoke import task +from invoke.exceptions import Failure, UnexpectedExit auth_backend_ip_addr = os.getenv('AUTH_BACKEND_IP_ADDR', '127.0.0.1') @@ -1221,10 +1218,15 @@ def ci_build_and_install_quiche(c, repo): c.run(f'sudo {repo}/builder-support/helpers/install_quiche.sh') # cannot use c.sudo() inside a cd() context, see https://github.com/pyinvoke/invoke/issues/687 - c.run('sudo mv /usr/lib/libdnsdist-quiche.so /usr/lib/libquiche.so') - c.run("sudo sed -i 's,^Libs:.*,Libs: -lquiche,g' /usr/lib/pkgconfig/quiche.pc") - c.run('mkdir -p /opt/dnsdist/lib') - c.run('cp /usr/lib/libquiche.so /opt/dnsdist/lib/libquiche.so') + for tentative in ['lib/x86_64-linux-gnu', 'lib/aarch64-linux-gnu', 'lib64', 'lib']: + quiche_lib = f'/usr/{tentative}/libdnsdist-quiche.so' + if not os.path.isfile(quiche_lib): + continue + c.run(f'sudo mv {quiche_lib} /usr/lib/libquiche.so') + c.run("sudo sed -i 's,^Libs:.*,Libs: -lquiche,g' /usr/lib/pkgconfig/quiche.pc") + c.run('mkdir -p /opt/dnsdist/lib') + c.run('cp /usr/lib/libquiche.so /opt/dnsdist/lib/libquiche.so') + break # this is run always def setup(): -- 2.47.2