vapier 15/07/13 05:39:53 Modified: criu-1.6.ebuild ChangeLog Log: Fix ARCH & OBJCOPY handling for cross-compiling #552234 by Kevin Cernekee. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 sys-process/criu/criu-1.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/criu-1.6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/criu-1.6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/criu-1.6.ebuild?r1=1.1&r2=1.2 Index: criu-1.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- criu-1.6.ebuild 15 Jun 2015 10:29:53 -0000 1.1 +++ criu-1.6.ebuild 13 Jul 2015 05:39:53 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.6.ebuild,v 1.1 2015/06/15 10:29:53 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.6.ebuild,v 1.2 2015/07/13 05:39:53 vapier Exp $ EAPI=5 @@ -32,19 +32,40 @@ epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch } +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86_64";; + arm64) echo "aarch64";; + x86) echo "i386";; + *) echo "${ARCH}";; + esac +} + src_compile() { - unset ARCH - emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 \ + SETPROCTITLE=$(usex setproctitle) \ + all docs } src_test() { # root privileges are required to dump all necessary info if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test fi } src_install() { - emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install + emake \ + ARCH="$(criu_arch)" \ + SYSCONFDIR="${EPREFIX}"/etc \ + PREFIX="${EPREFIX}"/usr \ + DESTDIR="${D}" \ + install dodoc CREDITS README.md } 1.25 sys-process/criu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/ChangeLog?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/ChangeLog?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/ChangeLog?r1=1.24&r2=1.25 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ChangeLog 15 Jun 2015 10:29:53 -0000 1.24 +++ ChangeLog 13 Jul 2015 05:39:53 -0000 1.25 @@ -1,6 +1,9 @@ # ChangeLog for sys-process/criu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.24 2015/06/15 10:29:53 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.25 2015/07/13 05:39:53 vapier Exp $ + + 13 Jul 2015; Mike Frysinger <[email protected]> criu-1.6.ebuild: + Fix ARCH & OBJCOPY handling for cross-compiling #552234 by Kevin Cernekee. *criu-1.6 (15 Jun 2015) @@ -120,4 +123,3 @@ 03 May 2013; Tim Harder <[email protected]> +files/crtools-0.4-flags.patch, +criu-0.5.ebuild, +metadata.xml: Upstream rename and version bump of sys-process/crtools. -
