[gentoo-commits] repo/gentoo:master commit in: dev-libs/libiconv/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     b1d04c1f018b2fb04c761a03d16f64bdfb45f6d0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 09:12:10 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 09:12:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d04c1f

dev-libs/libiconv: add Prefix support

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/libiconv/libiconv-1.15.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 1707033d72b..5b0db658660 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -11,8 +11,8 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
 	!userland_GNU? ( !sys-apps/man-pages )"
@@ -28,6 +28,12 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
 	# Disable NLS support because that creates a circular dependency
 	# between libiconv and gettext
 	ECONF_SOURCE="${S}" \