From: Simon Deziel <simon.deziel@canonical.com>
Date: Thu, 8 May 2025 19:07:30 +0000 (-0400)
Subject: meson.build: remove quirk for Ubuntu 14.04 libcap-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea92e49bd06e4193b92cf64f280975f531ebbe7a;p=thirdparty%2Flxc.git

meson.build: remove quirk for Ubuntu 14.04 libcap-dev

After some research, it seems that Ubuntu 14.10's libcap-dev package corrected
the mistake and shiped the `.pc` file.

Both Ubuntu releases are very old now so remove the workaround.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---

diff --git a/meson.build b/meson.build
index f0ab8c54e..2166cd277 100644
--- a/meson.build
+++ b/meson.build
@@ -414,10 +414,7 @@ endif
 ## Libcap..
 if want_capabilities
     libcap = dependency('libcap', required: false)
-    if not libcap.found()
-        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
-        libcap = cc.find_library('cap', required: false)
-    else
+    if libcap.found()
         have = cc.has_function('cap_get_file', dependencies: libcap, prefix: '#include <sys/capability.h>')
         srcconf.set10('LIBCAP_SUPPORTS_FILE_CAPABILITIES', have)
     endif
@@ -426,10 +423,6 @@ if want_capabilities
     liblxc_dependencies += libcap
 
     libcap_static = dependency('libcap', required: false, static: true)
-    if not libcap_static.found()
-        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
-        libcap_static = cc.find_library('cap', required: false, static: true)
-    endif
 
     code = '''
 int main(int argc, char *argv[]) { return 0; };