From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F27801382C5 for ; Fri, 4 May 2018 06:53:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D367E0984; Fri, 4 May 2018 06:53:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDEFBE0984 for ; Fri, 4 May 2018 06:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5DA4335C06 for ; Fri, 4 May 2018 06:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EEA332 for ; Fri, 4 May 2018 06:53:06 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1525416776.dd38b4c265dd04f2659a0d4518bc687f82c168ac.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-2.9.1-r1.ebuild media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: dd38b4c265dd04f2659a0d4518bc687f82c168ac X-VCS-Branch: master Date: Fri, 4 May 2018 06:53:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d74c4aa-ac65-4397-8a64-2cea3c64cae8 X-Archives-Hash: 427e893db50a6eb2e4572b5ad02482c1 commit: dd38b4c265dd04f2659a0d4518bc687f82c168ac Author: Lars Wendler gentoo org> AuthorDate: Fri May 4 06:52:56 2018 +0000 Commit: Lars Wendler gentoo 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[@]}" }