aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2022-04-29 18:41:45 -0700
committerChristian Lamparter <chunkeey@gmail.com>2022-05-15 16:32:40 +0200
commit28cec438071c6a5ce90ed4606df7cbe6ad8a100c (patch)
treeaa75aebe9476cd17c90e64f7f53b0fa3c3675569 /package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch
parentd93aae1d675caf47fbec684d12e39fb4090527d5 (diff)
downloadupstream-28cec438071c6a5ce90ed4606df7cbe6ad8a100c.tar.gz
upstream-28cec438071c6a5ce90ed4606df7cbe6ad8a100c.tar.bz2
upstream-28cec438071c6a5ce90ed4606df7cbe6ad8a100c.zip
util-linux: use meson to build
Compiles faster, is PIC by default, and does not have pkgconfig files with wrong paths. Add various fixes to it as it seems cross compilation was never tested. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch')
-rw-r--r--package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch b/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch
new file mode 100644
index 0000000000..d8b1199004
--- /dev/null
+++ b/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch
@@ -0,0 +1,31 @@
+From cd23a4336f49ba6a12ade557a09589f2a7c966f4 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 2 May 2022 16:18:33 -0700
+Subject: [PATCH] meson: make libcap-ng dependent on setpriv
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ meson.build | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/meson.build
++++ b/meson.build
+@@ -334,7 +334,8 @@ have = cc.has_function(
+ conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false)
+
+ lib_cap_ng = dependency(
+- 'libcap-ng')
++ 'libcap-ng',
++ required : get_option('build-setpriv'))
+
+ lib_selinux = dependency(
+ 'libselinux',
+@@ -1754,7 +1755,7 @@ if opt and not is_disabler(exe)
+ exes += exe
+ endif
+
+-opt = not get_option('build-setpriv').disabled()
++opt = not get_option('build-setpriv').disabled() and lib_cap_ng.found()
+ exe = executable(
+ 'setpriv',
+ setpriv_sources,