diff options
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 126d4273f708..f276edead559 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.284 2014/07/10 00:33:56 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.285 2014/07/10 17:12:06 floppym Exp $ + + 10 Jul 2014; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild: + Move rootprefix logic into the main configure block. *systemd-215-r1 (10 Jul 2014) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 5ccc5dbd6b6a..93ba6c7c76d0 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.124 2014/07/10 00:20:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.125 2014/07/10 17:12:06 floppym Exp $ EAPI=5 @@ -195,6 +195,9 @@ multilib_src_configure() { --with-bashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in $PATH --enable-split-usr + # For testing. + --with-rootprefix="${ROOTPREFIX-/usr}" + --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" # disable sysv compatibility --with-sysvinit-path= --with-sysvrcnd-path= @@ -270,14 +273,6 @@ multilib_src_configure() { ) fi - # Added for testing; this is UNSUPPORTED by the Gentoo systemd team! - if [[ -n ${ROOTPREFIX+set} ]]; then - myeconfargs+=( - --with-rootprefix="${ROOTPREFIX}" - --with-rootlibdir="${ROOTPREFIX}/$(get_libdir)" - ) - fi - if ! multilib_is_native_abi; then myeconfargs+=( ac_cv_search_cap_init= |