Skip to content

Commit

Permalink
dev-lang/ghc: conditionally apply sphinx patch
Browse files Browse the repository at this point in the history
The sphinx patch only applies to the source code and will cause a
failure if it is applied with USE=binary (this flag disables the
unpacking of the source code).

This reverts commit 978a89b.

Signed-off-by: hololeap <[email protected]>
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
hololeap authored and thesamesam committed Feb 21, 2023
1 parent 5c8ee4d commit 24cbad0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions dev-lang/ghc/ghc-9.0.2-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,6 @@ 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}"
Expand Down Expand Up @@ -592,6 +589,7 @@ 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"
Expand Down

0 comments on commit 24cbad0

Please sign in to comment.