diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-09-02 21:48:51 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-09-02 21:50:32 +0100 |
| commit | cec8a745f68e5e471f5cd0cd9005e443bc337d42 (patch) | |
| tree | 5754508a18d94ae570685bae27e71f05267a1beb /dev-lang/ghc | |
| parent | dev-lang/ghc: drop attemp to sed non-existing utils/haddock/doc/configure.ac (diff) | |
| download | gentoo-cec8a745f68e5e471f5cd0cd9005e443bc337d42.tar.gz gentoo-cec8a745f68e5e471f5cd0cd9005e443bc337d42.tar.bz2 gentoo-cec8a745f68e5e471f5cd0cd9005e443bc337d42.zip | |
dev-lang/ghc: bachport *-darwin* triplets
yuuko has CHOST=x86_64-apple-darwin16 which
does not work on ghc-8.2.1.
Backport upstream commit
http://git.haskell.org/ghc.git/commitdiff/d39a3409acd3c40fb018ec1c114f15d3ecef6ef9
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-lang/ghc')
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.2.1-darwin.patch | 31 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-8.2.1.ebuild | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch new file mode 100644 index 000000000000..53fedc4e4402 --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch @@ -0,0 +1,31 @@ +From d39a3409acd3c40fb018ec1c114f15d3ecef6ef9 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Thu, 1 Jun 2017 22:30:05 +0100 +Subject: [PATCH] aclocal.m4: add support for versioned darwin triplets + +The change adds support for 'darwin*' OS: + $ ./configure --target=aarch64-apple-darwin14 + +Reported-by: jp_rider +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + aclocal.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 7ad9c36453..437974a0c7 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1906,6 +1906,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ + aix*) # e.g. powerpc-ibm-aix7.1.3.0 + $3="aix" + ;; ++ darwin*) # e.g. aarch64-apple-darwin14 ++ $3="darwin" ++ ;; + freebsd*) # like i686-gentoo-freebsd7 + # i686-gentoo-freebsd8 + # i686-gentoo-freebsd8.2 +-- +2.14.1 + diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild index 753ef86b4986..66a642bf9292 100644 --- a/dev-lang/ghc/ghc-8.2.1.ebuild +++ b/dev-lang/ghc/ghc-8.2.1.ebuild @@ -481,6 +481,7 @@ src_prepare() { cd "${S}" # otherwise epatch will break epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch + epatch "${FILESDIR}"/${PN}-8.2.1-darwin.patch epatch "${FILESDIR}"/${PN}-8.2.1_rc1-cgen-constify.patch epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch |