Skip to content

Commit

Permalink
sys-apps/dbus: restore multilib logic
Browse files Browse the repository at this point in the history
These features only effect dbus-daemon, and should only be enabled for
the native ABI.

- selinux
- systemd
- x11_autolaunch
- elogind

Closes: https://bugs.gentoo.org/913532
Signed-off-by: Mike Gilbert <[email protected]>
  • Loading branch information
floppym committed Sep 2, 2023
1 parent a0373a9 commit 69e381a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sys-apps/dbus/dbus-1.15.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ multilib_src_configure() {

$(meson_native_true tools)

$(meson_feature elogind)
$(meson_feature systemd)
$(meson_native_use_feature elogind)
$(meson_native_use_feature systemd)
$(meson_use systemd user_session)
$(meson_feature X x11_autolaunch)
$(meson_native_use_feature X x11_autolaunch)
$(meson_native_use_feature valgrind)

# libaudit is *only* used in DBus wrt SELinux support, so disable it if
# not on an SELinux profile.
$(meson_feature selinux)
$(meson_feature selinux libaudit)
$(meson_native_use_feature selinux)
$(meson_native_use_feature selinux libaudit)

-Dsession_socket_dir="${EPREFIX}"/tmp
-Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
Expand Down

0 comments on commit 69e381a

Please sign in to comment.