[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/

[Lars Wendler]

commit:     dd38b4c265dd04f2659a0d4518bc687f82c168ac
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 06:52:56 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May  4 06:52:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd38b4c2

media-libs/freetype: Workaround windows mis-detection

Thanks to slyfox for providing a fix.

Closes: https://bugs.gentoo.org/654712
Package-Manager: Portage-2.3.35, Repoman-2.3.9

 media-libs/freetype/freetype-2.9.1-r1.ebuild | 7 +++++++
 media-libs/freetype/freetype-9999.ebuild     | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index 097647c00a6..f8e4fb37a31 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -175,6 +175,13 @@ multilib_src_configure() {
 		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
 	)
 
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 

diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 097647c00a6..f8e4fb37a31 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -175,6 +175,13 @@ multilib_src_configure() {
 		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
 	)
 
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }