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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D42D815800F for ; Sun, 5 Feb 2023 15:19:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF62CE07D1; Sun, 5 Feb 2023 15:19:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 917A6E07D1 for ; Sun, 5 Feb 2023 15:19:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77653340BDD for ; Sun, 5 Feb 2023 15:19:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3C937FB for ; Sun, 5 Feb 2023 15:19:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1675610338.978a89b79928342990c7da40c43a1cc9b84d3e7e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ghc/ghc-9.0.2-r3.ebuild X-VCS-Directories: dev-lang/ghc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 978a89b79928342990c7da40c43a1cc9b84d3e7e X-VCS-Branch: master Date: Sun, 5 Feb 2023 15:19:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3344f11-604b-40e7-a449-de98733b6dcf X-Archives-Hash: 55703b296013711be9ad8c982e00fd9b commit: 978a89b79928342990c7da40c43a1cc9b84d3e7e Author: Sam James gentoo org> AuthorDate: Sun Feb 5 15:18:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 5 15:18:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978a89b7 dev-lang/ghc: unconditionally apply sphinx patch Closes: https://bugs.gentoo.org/890563 Signed-off-by: Sam James gentoo.org> dev-lang/ghc/ghc-9.0.2-r3.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-lang/ghc/ghc-9.0.2-r3.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild index 1cd220d817eb..21f2dedfd9de 100644 --- a/dev-lang/ghc/ghc-9.0.2-r3.ebuild +++ b/dev-lang/ghc/ghc-9.0.2-r3.ebuild @@ -458,6 +458,9 @@ src_prepare() { [[ -e "${f}" ]] || ln -sf "$($(tc-getPKG_CONFIG) --cflags-only-I libffi | sed "s/-I//g" | tr -d " ")/$(basename "${f}")" "${f}" || die done + + eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch + if use binary; then if use prefix; then relocate_ghc "${EPREFIX}" @@ -544,7 +547,6 @@ src_prepare() { eapply "${FILESDIR}"/latomic-subword eapply "${WORKDIR}"/${P}-riscv64-llvm.patch eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround - eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch # mingw32 target pushd "${S}/libraries/Win32"