summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-05-04 08:52:56 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-05-04 08:52:56 +0200
commitdd38b4c265dd04f2659a0d4518bc687f82c168ac (patch)
treeea9aeb3543ba71d6f7e8dee709e868f393d0582c /media-libs/freetype
parentmedia-libs/freetype: Revbump to avoid file being installed as /usr/bin (diff)
downloadgentoo-dd38b4c265dd04f2659a0d4518bc687f82c168ac.tar.gz
gentoo-dd38b4c265dd04f2659a0d4518bc687f82c168ac.tar.bz2
gentoo-dd38b4c265dd04f2659a0d4518bc687f82c168ac.zip
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
Diffstat (limited to 'media-libs/freetype')
-rw-r--r--media-libs/freetype/freetype-2.9.1-r1.ebuild7
-rw-r--r--media-libs/freetype/freetype-9999.ebuild7
2 files changed, 14 insertions, 0 deletions
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[@]}"
}