summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2022-09-03 19:03:42 -0400
committerMike Gilbert <floppym@gentoo.org>2022-09-03 19:03:42 -0400
commit6068204e04aeacec4f132cb71c2438da90e2fb14 (patch)
tree38462e4d8d50840c437e6090d9f39bbae1aa8d23
parentdev-util/difftastic: drop 0.32.0 (diff)
downloadgentoo-6068204e.tar.gz
gentoo-6068204e.tar.bz2
gentoo-6068204e.zip
sys-apps/systemd: couple split-bin to split-usr
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--sys-apps/systemd/systemd-251.4.ebuild3
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild
index 064778e7f0c7..ba1fca739b5a 100644
--- a/sys-apps/systemd/systemd-251.4.ebuild
+++ b/sys-apps/systemd/systemd-251.4.ebuild
@@ -285,9 +285,8 @@ multilib_src_configure() {
-Dpamlibdir="$(getpam_mod_dir)"
# avoid bash-completion dep
-Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
$(meson_use split-usr)
- -Dsplit-bin=true
+ $(meson_use split-usr split-bin)
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
# Avoid infinite exec recursion, bug 642724
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index c8aea75e5c3e..d317887a899f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -282,9 +282,8 @@ multilib_src_configure() {
-Dpamlibdir="$(getpam_mod_dir)"
# avoid bash-completion dep
-Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
$(meson_use split-usr)
- -Dsplit-bin=true
+ $(meson_use split-usr split-bin)
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
# Avoid infinite exec recursion, bug 642724