floppym 14/07/10 17:12:07 Modified: systemd-9999.ebuild ChangeLog Log: Move rootprefix logic into the main configure block. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.125 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.125&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.125&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.124&r2=1.125 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- systemd-9999.ebuild 10 Jul 2014 00:20:25 -0000 1.124 +++ systemd-9999.ebuild 10 Jul 2014 17:12:06 -0000 1.125 @@ -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 @@ --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 @@ ) 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= 1.285 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.285&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.285&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.284&r2=1.285 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- ChangeLog 10 Jul 2014 00:33:56 -0000 1.284 +++ ChangeLog 10 Jul 2014 17:12:06 -0000 1.285 @@ -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 <[email protected]> systemd-9999.ebuild: + Move rootprefix logic into the main configure block. *systemd-215-r1 (10 Jul 2014)
