diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-12-17 14:53:10 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-12-17 14:53:19 -0500 |
| commit | 64b72f816761aad0ddbf0bb91a356832cbe7e1f1 (patch) | |
| tree | 7d1d1b2ec4210ee0f0a6018f679df49df838aac3 /sys-apps | |
| parent | mail-client/claws-mail: Removed old. (diff) | |
| download | gentoo-64b72f816761aad0ddbf0bb91a356832cbe7e1f1.tar.gz gentoo-64b72f816761aad0ddbf0bb91a356832cbe7e1f1.tar.bz2 gentoo-64b72f816761aad0ddbf0bb91a356832cbe7e1f1.zip | |
sys-apps/systemd: prefix fixes
- Restore rootprefix option with hard-coded value(s)
- Add EPREFIX to efi-libdir option.
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/systemd-236.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild index e0653a7a84ab..8142a96390ba 100644 --- a/sys-apps/systemd/systemd-236.ebuild +++ b/sys-apps/systemd/systemd-236.ebuild @@ -202,6 +202,7 @@ multilib_src_configure() { -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in PATH -Dsplit-usr=$(usex usrmerge false true) + -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= # no deps @@ -216,7 +217,7 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="/usr/$(get_libdir)" + -Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) -Dimportd=$(meson_multilib_native_use importd) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e0653a7a84ab..8142a96390ba 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -202,6 +202,7 @@ multilib_src_configure() { -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in PATH -Dsplit-usr=$(usex usrmerge false true) + -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= # no deps @@ -216,7 +217,7 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="/usr/$(get_libdir)" + -Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) -Dimportd=$(meson_multilib_native_use importd) |