| 1 |
commit: 6068204e04aeacec4f132cb71c2438da90e2fb14 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 23:03:42 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 23:03:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6068204e |
| 7 |
|
| 8 |
sys-apps/systemd: couple split-bin to split-usr |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-251.4.ebuild | 3 +-- |
| 13 |
sys-apps/systemd/systemd-9999.ebuild | 3 +-- |
| 14 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild |
| 17 |
index 064778e7f0c7..ba1fca739b5a 100644 |
| 18 |
--- a/sys-apps/systemd/systemd-251.4.ebuild |
| 19 |
+++ b/sys-apps/systemd/systemd-251.4.ebuild |
| 20 |
@@ -285,9 +285,8 @@ multilib_src_configure() { |
| 21 |
-Dpamlibdir="$(getpam_mod_dir)" |
| 22 |
# avoid bash-completion dep |
| 23 |
-Dbashcompletiondir="$(get_bashcompdir)" |
| 24 |
- # make sure we get /bin:/sbin in PATH |
| 25 |
$(meson_use split-usr) |
| 26 |
- -Dsplit-bin=true |
| 27 |
+ $(meson_use split-usr split-bin) |
| 28 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 29 |
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 30 |
# Avoid infinite exec recursion, bug 642724 |
| 31 |
|
| 32 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 33 |
index c8aea75e5c3e..d317887a899f 100644 |
| 34 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 35 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 36 |
@@ -282,9 +282,8 @@ multilib_src_configure() { |
| 37 |
-Dpamlibdir="$(getpam_mod_dir)" |
| 38 |
# avoid bash-completion dep |
| 39 |
-Dbashcompletiondir="$(get_bashcompdir)" |
| 40 |
- # make sure we get /bin:/sbin in PATH |
| 41 |
$(meson_use split-usr) |
| 42 |
- -Dsplit-bin=true |
| 43 |
+ $(meson_use split-usr split-bin) |
| 44 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 45 |
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 46 |
# Avoid infinite exec recursion, bug 642724 |
Archives