Use SYSROOT when looking for et headers to help cross-compiling; fix by Nam Nguyen from Chromium OS.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

9 files changed, 24 insertions, 17 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 50c517fd2eab..d5a619dc6673 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.715 2015/05/14 12:36:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.716 2015/06/03 17:03:40 vapier Exp $
+
+  03 Jun 2015; Mike Frysinger <vapier@gentoo.org> samba-3.5.21.ebuild,
+  samba-3.5.22.ebuild, samba-3.6.24.ebuild, samba-3.6.25.ebuild,
+  samba-4.0.25.ebuild, samba-4.0.26.ebuild, samba-4.1.17.ebuild,
+  samba-4.1.18.ebuild, samba-4.2.0.ebuild:
+  Use SYSROOT when looking for et headers to help cross-compiling; fix by Nam
+  Nguyen from Chromium OS.
 
   14 May 2015; Lars Wendler <polynomial-c@gentoo.org> samba-4.1.18.ebuild:
   Fixed dependency on talloc (bug #549452).
diff --git a/net-fs/samba/samba-3.5.21.ebuild b/net-fs/samba/samba-3.5.21.ebuild
index 5aef07b80cde..ae9aeed38862 100644
--- a/net-fs/samba/samba-3.5.21.ebuild
+++ b/net-fs/samba/samba-3.5.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.21.ebuild,v 1.15 2013/07/26 07:57:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.21.ebuild,v 1.16 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=4
 
diff --git a/net-fs/samba/samba-3.5.22.ebuild b/net-fs/samba/samba-3.5.22.ebuild
index 27bc2768487d..e1a9544199b6 100644
--- a/net-fs/samba/samba-3.5.22.ebuild
+++ b/net-fs/samba/samba-3.5.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.22.ebuild,v 1.9 2013/10/11 14:07:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.22.ebuild,v 1.10 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=4
 
diff --git a/net-fs/samba/samba-3.6.24.ebuild b/net-fs/samba/samba-3.6.24.ebuild
index 1f071c0f9541..823bd62649e4 100644
--- a/net-fs/samba/samba-3.6.24.ebuild
+++ b/net-fs/samba/samba-3.6.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.11 2014/12/26 09:18:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.12 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 
diff --git a/net-fs/samba/samba-4.0.25.ebuild b/net-fs/samba/samba-4.0.25.ebuild
index 9464e5663642..bbdaeca06f97 100644
--- a/net-fs/samba/samba-4.0.25.ebuild
+++ b/net-fs/samba/samba-4.0.25.ebuild
@@ -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/net-fs/samba/samba-4.0.25.ebuild,v 1.1 2015/02/23 22:43:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.25.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -135,7 +135,7 @@ src_configure() {
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
 
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
 
diff --git a/net-fs/samba/samba-4.0.26.ebuild b/net-fs/samba/samba-4.0.26.ebuild
index 7479b552d252..f1b8ee63bfb3 100644
--- a/net-fs/samba/samba-4.0.26.ebuild
+++ b/net-fs/samba/samba-4.0.26.ebuild
@@ -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/net-fs/samba/samba-4.0.26.ebuild,v 1.1 2015/05/14 00:15:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.26.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -135,7 +135,7 @@ src_configure() {
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
 
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
 
diff --git a/net-fs/samba/samba-4.1.17.ebuild b/net-fs/samba/samba-4.1.17.ebuild
index da5cd40a358b..9da451445b5a 100644
--- a/net-fs/samba/samba-4.1.17.ebuild
+++ b/net-fs/samba/samba-4.1.17.ebuild
@@ -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/net-fs/samba/samba-4.1.17.ebuild,v 1.2 2015/03/03 09:24:11 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.17.ebuild,v 1.3 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -131,7 +131,7 @@ src_configure() {
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
 
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
 
diff --git a/net-fs/samba/samba-4.1.18.ebuild b/net-fs/samba/samba-4.1.18.ebuild
index 10896de1af84..6bd6d0914bd1 100644
--- a/net-fs/samba/samba-4.1.18.ebuild
+++ b/net-fs/samba/samba-4.1.18.ebuild
@@ -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/net-fs/samba/samba-4.1.18.ebuild,v 1.2 2015/05/14 12:36:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.18.ebuild,v 1.3 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -131,7 +131,7 @@ src_configure() {
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
 
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
 
diff --git a/net-fs/samba/samba-4.2.0.ebuild b/net-fs/samba/samba-4.2.0.ebuild
index f250a02ae667..be6d23e2dfe7 100644
--- a/net-fs/samba/samba-4.2.0.ebuild
+++ b/net-fs/samba/samba-4.2.0.ebuild
@@ -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/net-fs/samba/samba-4.2.0.ebuild,v 1.1 2015/03/08 13:21:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.0.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -131,7 +131,7 @@ src_configure() {
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
 
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }