From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 15 Mar 2016 15:12:42 +0000 (+0100)
Subject: sys-process/criu: inject SYSROOT into the makefiles for libnl3 cflags so that target... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5d4129aba42824c0587957c470959ec9bda1866e;p=gentoo.git

sys-process/criu: inject SYSROOT into the makefiles for libnl3 cflags so that target include dir is used instead of host.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index c1c17f8b4b55..b8c219841a70 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}/${P}-flags.patch
 	epatch "${FILESDIR}"/${PV}/${P}-makefile.patch
 	epatch "${FILESDIR}"/${PV}/${P}-automagic-libbsd.patch
+	epatch "${FILESDIR}"/${PV}/${P}-sysroot.patch
 }
 
 criu_arch() {
diff --git a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch
new file mode 100644
index 000000000000..333c564c19ed
--- /dev/null
+++ b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch
@@ -0,0 +1,15 @@
+Using host headers when cross compiling is not a great idea.
+
+Index: criu-2.0/criu/Makefile
+===================================================================
+--- criu-2.0.orig/criu/Makefile
++++ criu-2.0/criu/Makefile
+@@ -51,7 +51,7 @@ ccflags-y		+= -iquote $(SRC_DIR)/criu/pi
+ ccflags-y		+= -iquote $(SRC_DIR)/criu/$(ARCH_DIR)
+ ccflags-y		+= -iquote $(SRC_DIR)/criu/$(ARCH_DIR)/include
+ ccflags-y		+= -iquote $(SRC_DIR)/
+-ccflags-y		+= -I/usr/include/libnl3
++ccflags-y		+= -I${SYSROOT}/usr/include/libnl3
+ 
+ export ccflags-y
+