| 1 |
commit: cec8a745f68e5e471f5cd0cd9005e443bc337d42 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 2 20:48:51 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 20:50:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec8a745 |
| 7 |
|
| 8 |
dev-lang/ghc: bachport *-darwin* triplets |
| 9 |
|
| 10 |
yuuko has CHOST=x86_64-apple-darwin16 which |
| 11 |
does not work on ghc-8.2.1. |
| 12 |
Backport upstream commit |
| 13 |
http://git.haskell.org/ghc.git/commitdiff/d39a3409acd3c40fb018ec1c114f15d3ecef6ef9 |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 16 |
|
| 17 |
dev-lang/ghc/files/ghc-8.2.1-darwin.patch | 31 +++++++++++++++++++++++++++++++ |
| 18 |
dev-lang/ghc/ghc-8.2.1.ebuild | 1 + |
| 19 |
2 files changed, 32 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..53fedc4e440 |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch |
| 26 |
@@ -0,0 +1,31 @@ |
| 27 |
+From d39a3409acd3c40fb018ec1c114f15d3ecef6ef9 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Sergei Trofimovich <slyfox@g.o> |
| 29 |
+Date: Thu, 1 Jun 2017 22:30:05 +0100 |
| 30 |
+Subject: [PATCH] aclocal.m4: add support for versioned darwin triplets |
| 31 |
+ |
| 32 |
+The change adds support for 'darwin*' OS: |
| 33 |
+ $ ./configure --target=aarch64-apple-darwin14 |
| 34 |
+ |
| 35 |
+Reported-by: jp_rider |
| 36 |
+Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 37 |
+--- |
| 38 |
+ aclocal.m4 | 3 +++ |
| 39 |
+ 1 file changed, 3 insertions(+) |
| 40 |
+ |
| 41 |
+diff --git a/aclocal.m4 b/aclocal.m4 |
| 42 |
+index 7ad9c36453..437974a0c7 100644 |
| 43 |
+--- a/aclocal.m4 |
| 44 |
++++ b/aclocal.m4 |
| 45 |
+@@ -1906,6 +1906,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ |
| 46 |
+ aix*) # e.g. powerpc-ibm-aix7.1.3.0 |
| 47 |
+ $3="aix" |
| 48 |
+ ;; |
| 49 |
++ darwin*) # e.g. aarch64-apple-darwin14 |
| 50 |
++ $3="darwin" |
| 51 |
++ ;; |
| 52 |
+ freebsd*) # like i686-gentoo-freebsd7 |
| 53 |
+ # i686-gentoo-freebsd8 |
| 54 |
+ # i686-gentoo-freebsd8.2 |
| 55 |
+-- |
| 56 |
+2.14.1 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild |
| 60 |
index 753ef86b498..66a642bf929 100644 |
| 61 |
--- a/dev-lang/ghc/ghc-8.2.1.ebuild |
| 62 |
+++ b/dev-lang/ghc/ghc-8.2.1.ebuild |
| 63 |
@@ -481,6 +481,7 @@ src_prepare() { |
| 64 |
cd "${S}" # otherwise epatch will break |
| 65 |
|
| 66 |
epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch |
| 67 |
+ epatch "${FILESDIR}"/${PN}-8.2.1-darwin.patch |
| 68 |
|
| 69 |
epatch "${FILESDIR}"/${PN}-8.2.1_rc1-cgen-constify.patch |
| 70 |
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |
Archives