]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Our `pkgconfig` file is also in the new library directory
authorRemi Gacogne <remi.gacogne@powerdns.com>
Thu, 6 Mar 2025 13:42:51 +0000 (14:42 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Mar 2025 16:25:08 +0000 (17:25 +0100)
tasks.py

index 151fb3a3df8a44547a6f353515af704b72531f5c..c1070e83ebabe2a4cd7553212bedebe1c7990131 100644 (file)
--- 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