| 1 |
commit: 3222ba8c78fd841601a2c7fe4d8520db3e36097a |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 22:54:22 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 22:54:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3222ba8c |
| 7 |
|
| 8 |
app-emulation/ganeti: only use GHC 7.10 patch when present, causes failures on older GHC. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 7 ++++++- |
| 13 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 16 |
index 600f1bd..2e696eb 100644 |
| 17 |
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 18 |
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 19 |
@@ -29,7 +29,6 @@ else |
| 20 |
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch |
| 21 |
"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 |
| 22 |
"${WORKDIR}"/debian/patches/relax-deps |
| 23 |
- "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch |
| 24 |
"${WORKDIR}"/debian/patches/zlib-0.6-compatibility |
| 25 |
"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 |
| 26 |
"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 |
| 27 |
@@ -205,6 +204,12 @@ pkg_setup () { |
| 28 |
|
| 29 |
src_prepare() { |
| 30 |
local testfile |
| 31 |
+ if has_version '>=dev-lang/ghc-7.10'; then |
| 32 |
+ # Breaks the build on 7.8 |
| 33 |
+ PATCHES+=( |
| 34 |
+ "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch |
| 35 |
+ ) |
| 36 |
+ fi |
| 37 |
eapply "${PATCHES[@]}" |
| 38 |
# Upstream commits: |
| 39 |
# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb |
Archives