diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-05-24 20:10:26 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-06-03 18:14:13 -0700 |
| commit | 321d90360581f8eeb26903e90b2c4e3ce71dcc50 (patch) | |
| tree | a5ae9915cb1961cbb4ae6ea63b7b91ce843fe249 /sys-fs | |
| parent | sys-fs/fuse: Switch to meson-multilib (diff) | |
| download | gentoo-321d90360581f8eeb26903e90b2c4e3ce71dcc50.tar.gz gentoo-321d90360581f8eeb26903e90b2c4e3ce71dcc50.tar.bz2 gentoo-321d90360581f8eeb26903e90b2c4e3ce71dcc50.zip | |
sys-fs/udev: Switch to meson-multilib
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/udev-248.ebuild | 18 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 18 |
2 files changed, 10 insertions, 26 deletions
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-248.ebuild +++ b/sys-fs/udev/udev-248.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]] ; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -99,24 +99,16 @@ src_prepare() { default } -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1" ; then - echo true - else - echo false - fi -} - multilib_src_configure() { local emesonargs=( - -Dacl=$(meson_multilib_native_use acl) + $(meson_native_use_bool acl) -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) -Dlink-udev-shared=false -Dsplit-usr=true -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dstatic-libudev=$(usex static-libs true false) + $(meson_use static-libs static-libudev) # Prevent automagic deps -Dgcrypt=false diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]] ; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -99,24 +99,16 @@ src_prepare() { default } -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1" ; then - echo true - else - echo false - fi -} - multilib_src_configure() { local emesonargs=( - -Dacl=$(meson_multilib_native_use acl) + $(meson_native_use_bool acl) -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) -Dlink-udev-shared=false -Dsplit-usr=true -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dstatic-libudev=$(usex static-libs true false) + $(meson_use static-libs static-libudev) # Prevent automagic deps -Dgcrypt=false |