From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 6 Mar 2025 13:42:51 +0000 (+0100)
Subject: dnsdist: Our `pkgconfig` file is also in the new library directory
X-Git-Tag: dnsdist-2.0.0-alpha1~30^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb3615af1ed8d10202b924e7c6671a4eef1cc9e1;p=thirdparty%2Fpdns.git

dnsdist: Our `pkgconfig` file is also in the new library directory
---

diff --git a/tasks.py b/tasks.py
index 151fb3a3df..c1070e83eb 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1219,11 +1219,12 @@ def ci_build_and_install_quiche(c, repo):
 
     # cannot use c.sudo() inside a cd() context, see https://github.com/pyinvoke/invoke/issues/687
     for tentative in ['lib/x86_64-linux-gnu', 'lib/aarch64-linux-gnu', 'lib64', 'lib']:
-        quiche_lib = f'/usr/{tentative}/libdnsdist-quiche.so'
+        tentative_libdir = f'/usr/{tentative}'
+        quiche_lib = f'{tentative_libdir}/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(f"sudo sed -i 's,^Libs:.*,Libs: -lquiche,g' {tentative_libdir}/pkgconfig/quiche.pc")
         c.run('mkdir -p /opt/dnsdist/lib')
         c.run('cp /usr/lib/libquiche.so /opt/dnsdist/lib/libquiche.so')
         break