~emersion/public-inbox

basu: meson: add libcap option v1 APPLIED

Arsen Arsenović: 2
 meson: add libcap option
 meson: convert audit option to feature object

 4 files changed, 7 insertions(+), 11 deletions(-)
#621968 alpine.yml success
#621969 freebsd.yml success
builds.sr.ht
basu/patches: SUCCESS in 59s

[meson: add libcap option][0] from [Arsen Arsenović][1]

[0]: https://lists.sr.ht/~emersion/public-inbox/patches/26240
[1]: mailto:arsen@aarsen.me

✓ #621968 SUCCESS basu/patches/alpine.yml  https://builds.sr.ht/~emersion/job/621968
✓ #621969 SUCCESS basu/patches/freebsd.yml https://builds.sr.ht/~emersion/job/621969
Both patches pushed, thanks!
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~emersion/public-inbox/patches/26240/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH basu 1/2] meson: add libcap option Export this patch

it's better to provide the user with this choice instead of
unconditionally magically depending on it
---
Good afternoon!

I'm packaging Basu for Gentoo for use with xdg-desktop-portal-wlr, and I
noticed these two quirks in the build system. These required
patching/workarounds according to Gentoo policies, and are a general QoL
improvement, which I think is worth upstreaming.

Thank you in advance

 meson.build       | 2 +-
 meson_options.txt | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 056c7c4..357b346 100644
--- a/meson.build
+++ b/meson.build
@@ -231,7 +231,7 @@ threads = dependency('threads')
librt = cc.find_library('rt')
libm = cc.find_library('m')

libcap = dependency('libcap', required: false)
libcap = dependency('libcap', required: get_option('libcap'))
have_libcap = libcap.found()
conf.set10('HAVE_LIBCAP', have_libcap)

diff --git a/meson_options.txt b/meson_options.txt
index 8cf3a33..ae5c7b1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,3 +14,6 @@ option('system-bus-address', type : 'string',

option('audit', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libaudit support')

option('libcap', type : 'feature',
       description : 'libcap support')
-- 
2.32.0

[PATCH basu 2/2] meson: convert audit option to feature object Export this patch

features are more idiomatic and ubiquitous
---
 meson.build       | 11 ++---------
 meson_options.txt |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index 357b346..1f29690 100644
--- a/meson.build
+++ b/meson.build
@@ -235,15 +235,8 @@ libcap = dependency('libcap', required: get_option('libcap'))
have_libcap = libcap.found()
conf.set10('HAVE_LIBCAP', have_libcap)

want_audit = get_option('audit')
if want_audit != 'false'
        libaudit = dependency('audit', required : want_audit == 'true')
        have = libaudit.found()
else
        have = false
        libaudit = []
endif
conf.set10('HAVE_AUDIT', have)
libaudit = dependency('audit', required : get_option('audit'))
conf.set10('HAVE_AUDIT', libaudit.found())

tests = []

diff --git a/meson_options.txt b/meson_options.txt
index ae5c7b1..87adfc2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,7 +12,7 @@ option('system-bus-address', type : 'string',
       description : 'The address of the sytem bus (defined at dbus compilation)',
       value : 'unix:path=/var/run/dbus/system_bus_socket')

option('audit', type : 'combo', choices : ['auto', 'true', 'false'],
option('audit', type : 'feature',
       description : 'libaudit support')

option('libcap', type : 'feature',
-- 
2.32.0
builds.sr.ht
basu/patches: SUCCESS in 59s

[meson: add libcap option][0] from [Arsen Arsenović][1]

[0]: https://lists.sr.ht/~emersion/public-inbox/patches/26240
[1]: mailto:arsen@aarsen.me

✓ #621968 SUCCESS basu/patches/alpine.yml  https://builds.sr.ht/~emersion/job/621968
✓ #621969 SUCCESS basu/patches/freebsd.yml https://builds.sr.ht/~emersion/job/621969
Both patches pushed, thanks!