[patch] patch v1

0001-sys-process-criu-Fix-cross-compilation.patch (text/plain), 1.80 KB, created by Kevin Cernekee on 2015-06-15 22:32:08 UTC

From e2f75453ad48a4168f63678cc27729a9759bac16 Mon Sep 17 00:00:00 2001
From: Kevin Cernekee <[e-mail]>
Date: Mon, 15 Jun 2015 15:24:46 -0700
Subject: [PATCH] sys-process/criu: Fix cross compilation

This package failed cross-compilation for ARM on an amd64 build machine
for the following reasons:

1) The criu Makefile sets $ARCH based on the $(uname -m) output on the
build machine, so it tried to invoke the ARM cross compiler on amd64
assembly files.  We need to pass in a suitable $ARCH variable to
override this behavior.

2) On systems where ld.gold is the default linker, an internal linker
error was seen (crbug.com/500708).  While this is being investigated, we
can build criu using ld.bfd.

3) $OBJCOPY defaults to the native objcopy, and this also needs to be
overridden.

Signed-off-by: Kevin Cernekee <[e-mail]>
---
 sys-process/criu/criu-1.5.2.ebuild | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-1.5.2.ebuild b/sys-process/criu/criu-1.5.2.ebuild
index 1b4f3bd883db..a97ef29bdad2 100644
--- a/sys-process/criu/criu-1.5.2.ebuild
+++ b/sys-process/criu/criu-1.5.2.ebuild
@@ -34,7 +34,24 @@ src_prepare() {
 
 src_compile() {
 	unset ARCH
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs
+
+	# On native builds, $ARCH is inferred from $(uname -m)
+	if tc-is-cross-compiler; then
+		if use x86; then
+			export ARCH=i386
+		elif use amd64; then
+			export ARCH=x86_64
+		elif use arm; then
+			export ARCH=arm
+		elif use arm64; then
+			export ARCH=aarch64
+		else
+			die -q "Unsupported architecture"
+		fi
+	fi
+
+	tc-export OBJCOPY
+	emake CC="$(tc-getCC)" LD="$(tc-getLD).bfd" OBJCOPY="${OBJCOPY}" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs
 }
 
 src_test() {
-- 
2.1.2