| 1 |
commit: 55e2390cae9029846c6a69d852cf03058b6c4aae |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 9 19:09:03 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 9 19:09:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e2390c |
| 7 |
|
| 8 |
dev-lang/ghc: backport binutils fixes |
| 9 |
|
| 10 |
A few changes: |
| 11 |
- move off from code.haskell.org to /slyfox.uni.cx for binaries |
| 12 |
- enable --relax on all arches, not just sparc |
| 13 |
- fix dwarf generation (-g) on binutils-2.30 |
| 14 |
- allow >=haskell-updater-1.3 |
| 15 |
- fix relocation for haddoc, hp2ps, hpc |
| 16 |
|
| 17 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 18 |
|
| 19 |
dev-lang/ghc/ghc-7.10.3.ebuild | 20 ++++++++++---------- |
| 20 |
dev-lang/ghc/ghc-7.8.4.ebuild | 20 ++++++++++---------- |
| 21 |
dev-lang/ghc/ghc-8.0.2.ebuild | 20 +++++++++++--------- |
| 22 |
dev-lang/ghc/ghc-8.2.1.ebuild | 23 ++++++++++++----------- |
| 23 |
dev-lang/ghc/ghc-8.2.2.ebuild | 22 ++++++++++++---------- |
| 24 |
dev-lang/ghc/ghc-8.4.1.ebuild | 17 +++++++++-------- |
| 25 |
dev-lang/ghc/ghc-8.4.2.ebuild | 6 ++++++ |
| 26 |
7 files changed, 70 insertions(+), 58 deletions(-) |
| 27 |
|
| 28 |
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild |
| 29 |
index 9ec9caec506..43a286feca8 100644 |
| 30 |
--- a/dev-lang/ghc/ghc-7.10.3.ebuild |
| 31 |
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2017 Gentoo Foundation |
| 34 |
+# Copyright 1999-2018 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
EAPI=5 |
| 38 |
@@ -24,17 +24,17 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 39 |
arch_binaries="" |
| 40 |
|
| 41 |
# sorted! |
| 42 |
-arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 43 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" |
| 44 |
-arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PVR}-amd64.tbz2 )" |
| 45 |
-arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )" |
| 46 |
-arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 47 |
-arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 48 |
-arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 49 |
-arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PVR}-x86.tbz2 )" |
| 50 |
+arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 51 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-arm.tbz2 )" |
| 52 |
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PVR}-amd64.tbz2 )" |
| 53 |
+arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64.tbz2 )" |
| 54 |
+arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 55 |
+arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 56 |
+arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 57 |
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PVR}-x86.tbz2 )" |
| 58 |
|
| 59 |
# various ports: |
| 60 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 61 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 62 |
|
| 63 |
# 0 - yet |
| 64 |
yet_binary() { |
| 65 |
|
| 66 |
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild |
| 67 |
index 96a398263f2..49995a58d35 100644 |
| 68 |
--- a/dev-lang/ghc/ghc-7.8.4.ebuild |
| 69 |
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2017 Gentoo Foundation |
| 72 |
+# Copyright 1999-2018 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI=5 |
| 76 |
@@ -24,17 +24,17 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 77 |
arch_binaries="" |
| 78 |
|
| 79 |
# sorted! |
| 80 |
-arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 81 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" |
| 82 |
-arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )" |
| 83 |
-arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )" |
| 84 |
-arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 85 |
-arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 86 |
-arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 87 |
-arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )" |
| 88 |
+arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 89 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-arm.tbz2 )" |
| 90 |
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-amd64.tbz2 )" |
| 91 |
+arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64.tbz2 )" |
| 92 |
+arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 93 |
+arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 94 |
+arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 95 |
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86.tbz2 )" |
| 96 |
|
| 97 |
# various ports: |
| 98 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 99 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 100 |
|
| 101 |
# 0 - yet |
| 102 |
yet_binary() { |
| 103 |
|
| 104 |
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild |
| 105 |
index b95016abd95..d8e84e58f1d 100644 |
| 106 |
--- a/dev-lang/ghc/ghc-8.0.2.ebuild |
| 107 |
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild |
| 108 |
@@ -24,18 +24,18 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 109 |
arch_binaries="" |
| 110 |
|
| 111 |
# sorted! |
| 112 |
-arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 113 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" |
| 114 |
-arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-arm64.tbz2 )" |
| 115 |
+arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 116 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-arm.tbz2 )" |
| 117 |
+arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-arm64.tbz2 )" |
| 118 |
arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" |
| 119 |
-arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )" |
| 120 |
-arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 121 |
-arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 122 |
-#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 123 |
+arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64.tbz2 )" |
| 124 |
+arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 125 |
+arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 126 |
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 127 |
arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" |
| 128 |
|
| 129 |
# various ports: |
| 130 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 131 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 132 |
|
| 133 |
# 0 - yet |
| 134 |
yet_binary() { |
| 135 |
@@ -106,7 +106,7 @@ DEPEND="${RDEPEND} |
| 136 |
>=dev-libs/libxslt-1.1.2 ) |
| 137 |
!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 138 |
|
| 139 |
-PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" |
| 140 |
+PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )" |
| 141 |
|
| 142 |
REQUIRED_USE="?? ( ghcbootstrap binary )" |
| 143 |
|
| 144 |
@@ -467,6 +467,7 @@ src_prepare() { |
| 145 |
|
| 146 |
epatch "${FILESDIR}"/${PN}-8.0.1_rc1-cgen-constify.patch |
| 147 |
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
| 148 |
+ epatch "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch |
| 149 |
|
| 150 |
epatch "${FILESDIR}"/${PN}-8.0.1-limit-jN.patch |
| 151 |
epatch "${FILESDIR}"/${PN}-8.0.1-ww-args-limit.patch |
| 152 |
@@ -474,6 +475,7 @@ src_prepare() { |
| 153 |
epatch "${FILESDIR}"/${PN}-8.0.2_rc2-old-sphinx.patch |
| 154 |
epatch "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch |
| 155 |
epatch "${FILESDIR}"/${PN}-8.0.2-O2-unreg.patch |
| 156 |
+ epatch "${FILESDIR}"/${PN}-8.0.2-binutils-2.30.patch |
| 157 |
|
| 158 |
bump_libs |
| 159 |
|
| 160 |
|
| 161 |
diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild |
| 162 |
index 1b95d8e8ae0..61e2fdf5dd9 100644 |
| 163 |
--- a/dev-lang/ghc/ghc-8.2.1.ebuild |
| 164 |
+++ b/dev-lang/ghc/ghc-8.2.1.ebuild |
| 165 |
@@ -1,4 +1,4 @@ |
| 166 |
-# Copyright 1999-2017 Gentoo Foundation |
| 167 |
+# Copyright 1999-2018 Gentoo Foundation |
| 168 |
# Distributed under the terms of the GNU General Public License v2 |
| 169 |
|
| 170 |
EAPI=5 |
| 171 |
@@ -23,18 +23,18 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 172 |
arch_binaries="" |
| 173 |
|
| 174 |
# sorted! |
| 175 |
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 176 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 177 |
-#arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 178 |
-arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" |
| 179 |
-#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 180 |
-#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 181 |
-#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 182 |
-#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 183 |
-arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" |
| 184 |
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 185 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 186 |
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 187 |
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" |
| 188 |
+#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 189 |
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 190 |
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 191 |
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 192 |
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" |
| 193 |
|
| 194 |
# various ports: |
| 195 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 196 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 197 |
|
| 198 |
# 0 - yet |
| 199 |
yet_binary() { |
| 200 |
@@ -474,6 +474,7 @@ src_prepare() { |
| 201 |
|
| 202 |
epatch "${FILESDIR}"/${PN}-8.2.1_rc1-cgen-constify.patch |
| 203 |
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
| 204 |
+ epatch "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch |
| 205 |
|
| 206 |
epatch "${FILESDIR}"/${PN}-8.2.1_rc2-O2-unreg.patch |
| 207 |
|
| 208 |
|
| 209 |
diff --git a/dev-lang/ghc/ghc-8.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild |
| 210 |
index 5d07ec19494..6e41de8bde9 100644 |
| 211 |
--- a/dev-lang/ghc/ghc-8.2.2.ebuild |
| 212 |
+++ b/dev-lang/ghc/ghc-8.2.2.ebuild |
| 213 |
@@ -1,4 +1,4 @@ |
| 214 |
-# Copyright 1999-2017 Gentoo Foundation |
| 215 |
+# Copyright 1999-2018 Gentoo Foundation |
| 216 |
# Distributed under the terms of the GNU General Public License v2 |
| 217 |
|
| 218 |
EAPI=6 |
| 219 |
@@ -23,18 +23,18 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 220 |
arch_binaries="" |
| 221 |
|
| 222 |
# sorted! |
| 223 |
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 224 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 225 |
-#arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 226 |
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 227 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 228 |
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 229 |
arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" |
| 230 |
-#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 231 |
-#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 232 |
-#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 233 |
-#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 234 |
+#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 235 |
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 236 |
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 237 |
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 238 |
arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" |
| 239 |
|
| 240 |
# various ports: |
| 241 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 242 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 243 |
|
| 244 |
# 0 - yet |
| 245 |
yet_binary() { |
| 246 |
@@ -102,7 +102,7 @@ DEPEND="${RDEPEND} |
| 247 |
>=dev-libs/libxslt-1.1.2 ) |
| 248 |
!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 249 |
|
| 250 |
-PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" |
| 251 |
+PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )" |
| 252 |
|
| 253 |
REQUIRED_USE="?? ( ghcbootstrap binary )" |
| 254 |
|
| 255 |
@@ -475,8 +475,10 @@ src_prepare() { |
| 256 |
|
| 257 |
eapply "${FILESDIR}"/${PN}-8.2.1_rc1-cgen-constify.patch |
| 258 |
eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
| 259 |
+ eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch |
| 260 |
|
| 261 |
eapply "${FILESDIR}"/${PN}-8.2.1_rc2-O2-unreg.patch |
| 262 |
+ eapply "${FILESDIR}"/${PN}-8.0.2-binutils-2.30.patch |
| 263 |
|
| 264 |
# a bunch of crosscompiler patches |
| 265 |
eapply "${FILESDIR}"/${PN}-8.2.1_rc1-unphased-cross.patch |
| 266 |
|
| 267 |
diff --git a/dev-lang/ghc/ghc-8.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild |
| 268 |
index 0e4762bb07d..e23cc25aadd 100644 |
| 269 |
--- a/dev-lang/ghc/ghc-8.4.1.ebuild |
| 270 |
+++ b/dev-lang/ghc/ghc-8.4.1.ebuild |
| 271 |
@@ -23,18 +23,18 @@ HOMEPAGE="http://www.haskell.org/ghc/" |
| 272 |
arch_binaries="" |
| 273 |
|
| 274 |
# sorted! |
| 275 |
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" |
| 276 |
-#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 277 |
-#arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 278 |
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" |
| 279 |
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" |
| 280 |
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" |
| 281 |
arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" |
| 282 |
-#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 283 |
-#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" |
| 284 |
-#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" |
| 285 |
-#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" |
| 286 |
+#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" |
| 287 |
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" |
| 288 |
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" |
| 289 |
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" |
| 290 |
arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" |
| 291 |
|
| 292 |
# various ports: |
| 293 |
-#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 294 |
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 295 |
|
| 296 |
# 0 - yet |
| 297 |
yet_binary() { |
| 298 |
@@ -473,6 +473,7 @@ src_prepare() { |
| 299 |
eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch |
| 300 |
eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch |
| 301 |
eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
| 302 |
+ eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch |
| 303 |
|
| 304 |
# a bunch of crosscompiler patches |
| 305 |
# needs newer version: |
| 306 |
|
| 307 |
diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild |
| 308 |
index 4fe09376cf4..2b6dbd92fe9 100644 |
| 309 |
--- a/dev-lang/ghc/ghc-8.4.2.ebuild |
| 310 |
+++ b/dev-lang/ghc/ghc-8.4.2.ebuild |
| 311 |
@@ -315,6 +315,9 @@ relocate_ghc() { |
| 312 |
"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ |
| 313 |
"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ |
| 314 |
"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ |
| 315 |
+ "${WORKDIR}/usr/bin/haddock-ghc-${GHC_PV}" \ |
| 316 |
+ "${WORKDIR}/usr/bin/hp2ps" \ |
| 317 |
+ "${WORKDIR}/usr/bin/hpc" \ |
| 318 |
"${WORKDIR}/usr/bin/hsc2hs" \ |
| 319 |
"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ |
| 320 |
"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* |
| 321 |
@@ -473,6 +476,9 @@ src_prepare() { |
| 322 |
eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch |
| 323 |
eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch |
| 324 |
eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
| 325 |
+ eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch |
| 326 |
+ eapply "${FILESDIR}"/${PN}-8.0.2-binutils-2.30.patch |
| 327 |
+ eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch |
| 328 |
|
| 329 |
# a bunch of crosscompiler patches |
| 330 |
# needs newer version: |
Archives