| 1 |
commit: 42b11bc1d31857b42efff40f8069f9b57593ca20 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 29 20:42:22 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 29 20:44:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b11bc1 |
| 7 |
|
| 8 |
sys-apps/systemd: use meson.eclass |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-9999.ebuild | 12 ++---------- |
| 13 |
1 file changed, 2 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 16 |
index e384f59919a..beab35a7441 100644 |
| 17 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 18 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 19 |
@@ -13,7 +13,7 @@ fi |
| 20 |
|
| 21 |
PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
| 22 |
|
| 23 |
-inherit bash-completion-r1 linux-info multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user |
| 24 |
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user |
| 25 |
|
| 26 |
DESCRIPTION="System and service manager for Linux" |
| 27 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 28 |
@@ -91,8 +91,6 @@ DEPEND="${COMMON_DEPEND} |
| 29 |
app-arch/xz-utils:0 |
| 30 |
dev-util/gperf |
| 31 |
>=dev-util/intltool-0.50 |
| 32 |
- >=dev-util/meson-0.40.0 |
| 33 |
- dev-util/ninja |
| 34 |
>=sys-apps/coreutils-8.16 |
| 35 |
>=sys-kernel/linux-headers-${MINKV} |
| 36 |
virtual/pkgconfig |
| 37 |
@@ -199,10 +197,6 @@ meson_multilib_native_use() { |
| 38 |
|
| 39 |
multilib_src_configure() { |
| 40 |
local myconf=( |
| 41 |
- --buildtype=plain |
| 42 |
- --prefix="${EPREFIX}/usr" |
| 43 |
- --libdir="$(get_libdir)" |
| 44 |
- --sysconfdir="${EPREFIX}/etc" |
| 45 |
--localstatedir="${EPREFIX}/var" |
| 46 |
-Dpamlibdir="$(getpam_mod_dir)" |
| 47 |
# avoid bash-completion dep |
| 48 |
@@ -283,9 +277,7 @@ multilib_src_configure() { |
| 49 |
) |
| 50 |
fi |
| 51 |
|
| 52 |
- set -- meson "${myconf[@]}" "${S}" |
| 53 |
- echo "$@" |
| 54 |
- "$@" || die |
| 55 |
+ meson_src_configure "${myconf[@]}" |
| 56 |
} |
| 57 |
|
| 58 |
multilib_src_compile() { |
Archives