Add hack for gnulib acl check when cross-compiling #333887 by Luca Barbato.

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

4 files changed, 21 insertions, 8 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 682a0eab0c0c..736c817c2633 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.229 2014/01/16 13:35:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.230 2014/01/18 06:13:43 vapier Exp $
+
+  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> gettext-0.18.2.ebuild,
+  gettext-0.18.3.1-r1.ebuild, gettext-0.18.3.2.ebuild:
+  Add hack for gnulib acl check when cross-compiling #333887 by Luca Barbato.
 
 *gettext-0.18.3.2 (16 Jan 2014)
 
diff --git a/sys-devel/gettext/gettext-0.18.2.ebuild b/sys-devel/gettext/gettext-0.18.2.ebuild
index 819e3ae96642..871966abef35 100644
--- a/sys-devel/gettext/gettext-0.18.2.ebuild
+++ b/sys-devel/gettext/gettext-0.18.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.2.ebuild,v 1.14 2013/12/16 07:21:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.2.ebuild,v 1.15 2014/01/18 06:13:43 vapier Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc"
 
 DEPEND="virtual/libiconv
@@ -43,6 +43,9 @@ src_configure() {
 	fi
 	use cxx || export CXX=$(tc-getCC)
 
+	# Should be able to drop this hack in next release. #333887
+	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
+
 	# --without-emacs: Emacs support is now in a separate package
 	# --with-included-glib: glib depends on us so avoid circular deps
 	# --with-included-libcroco: libcroco depends on glib which ... ^^^
diff --git a/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild b/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild
index 757ecd27497d..423f6c4982cb 100644
--- a/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild
@@ -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-devel/gettext/gettext-0.18.3.1-r1.ebuild,v 1.4 2014/01/05 19:50:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild,v 1.5 2014/01/18 06:13:43 vapier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc"
 
 DEPEND="virtual/libiconv
@@ -44,6 +44,9 @@ src_configure() {
 	fi
 	use cxx || export CXX=$(tc-getCC)
 
+	# Should be able to drop this hack in next release. #333887
+	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
+
 	# --without-emacs: Emacs support is now in a separate package
 	# --with-included-glib: glib depends on us so avoid circular deps
 	# --with-included-libcroco: libcroco depends on glib which ... ^^^
diff --git a/sys-devel/gettext/gettext-0.18.3.2.ebuild b/sys-devel/gettext/gettext-0.18.3.2.ebuild
index a453ca946a4e..f88a6fbf2acb 100644
--- a/sys-devel/gettext/gettext-0.18.3.2.ebuild
+++ b/sys-devel/gettext/gettext-0.18.3.2.ebuild
@@ -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-devel/gettext/gettext-0.18.3.2.ebuild,v 1.1 2014/01/16 13:35:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.3.2.ebuild,v 1.2 2014/01/18 06:13:43 vapier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc"
 
 # only runtime goes multilib
@@ -68,6 +68,9 @@ multilib_src_configure() {
 	fi
 	use cxx || export CXX=$(tc-getCC)
 
+	# Should be able to drop this hack in next release. #333887
+	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
+
 	local ECONF_SOURCE=${S}
 	if ! multilib_build_binaries ; then
 		# for non-native ABIs, we build runtime only