aboutsummaryrefslogtreecommitdiffstats
path: root/community/ghc/0008-build-unlit-twice.patch
diff options
context:
space:
mode:
authorMitch Tishmack <mitch.tishmack@gmail.com>2017-07-30 11:39:11 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-12 07:36:35 +0000
commit0194bb7bf46305018dcebec6f44468c28da2c401 (patch)
treef28364d33aff2c323a02aab15c4d38ba15c55827 /community/ghc/0008-build-unlit-twice.patch
parent32571b1d45067ededceb0ca113967b9d9ee0ab37 (diff)
downloadaports-0194bb7bf46305018dcebec6f44468c28da2c401.tar.bz2
aports-0194bb7bf46305018dcebec6f44468c28da2c401.tar.xz
community/ghc: upgrade to 8.4.2
There is only one package that depends on ghc right now, and that is community/cabal. Removed armhf support for now as there appear to be overall issues with that architecture across libc's. Additionally, for 8.6 to build we will need to update to at least 8.2. As such, dropping support for armhf makes the most sense for right now. I'll continue working with upstream to fix it. Removed the haskell-* provides as that was originally a plan to follow what arch was doing for their haskell setup. In lieu of that not providing value removing them entirely. The ghc test suite was updated to use python 3 from python 2. Finally really late in the release candidate cycle a change to ld detection necessitated the need to pass --disable-ld-override to the configure of ghc. Without that in place there appears to be some shenanigans going on in exported symbols. Ghc upstream ticket: https://ghc.haskell.org/trac/ghc/ticket/13958 Offending commmit: https://git.haskell.org/ghc.git/commitdiff/2785ef0e31a123400da950ffafebe6cb1ce3f4eb
Diffstat (limited to 'community/ghc/0008-build-unlit-twice.patch')
-rw-r--r--community/ghc/0008-build-unlit-twice.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/community/ghc/0008-build-unlit-twice.patch b/community/ghc/0008-build-unlit-twice.patch
deleted file mode 100644
index 91380a5c26..0000000000
--- a/community/ghc/0008-build-unlit-twice.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From eba93774c3ce2f151e7c72f6d068b753f24dbcfa Mon Sep 17 00:00:00 2001
-From: Thomas Miedema <thomasmiedema@gmail.com>
-Date: Wed, 15 Jun 2016 14:56:46 +0200
-Subject: [PATCH] Build system: build unlit twice
-
-See Note [Why build certain utils twice?] in utils/ghc-pkg/ghc.mk
----
- utils/ghc-pkg/ghc.mk | 7 ++++++-
- utils/unlit/ghc.mk | 10 +++++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
-index f7d97de..410de72 100644
---- a/utils/ghc-pkg/ghc.mk
-+++ b/utils/ghc-pkg/ghc.mk
-@@ -27,7 +27,7 @@ utils/ghc-pkg_PACKAGE = ghc-pkg
- # Note [Why build certain utils twice?]
- #
- # We build certain utils twice: once with stage0, and once with stage1.
--# Examples are ghc-pkg and hsc2hs.
-+# Examples are ghc-pkg, hsc2hs and unlit.
- #
- # These tools are needed during the bootstrapping process, so we have to use
- # stage0 to build them at first (stage1 doesn't exist yet). (side note: they're
-@@ -38,6 +38,11 @@ utils/ghc-pkg_PACKAGE = ghc-pkg
- # dynamically linked. But the stage0 copies are either statically linked, or
- # linked against libraries on the build machine.
- #
-+# Another reason why we can't install the stage0 copies is that they are
-+# built to run on the build(=host) platform, but when installing a
-+# "cross-compiled stage2 compiler" we need copies that run on the target
-+# platform.
-+#
- # Therefore we build fresh copies, using the stage1 compiler, and install them
- # when you run 'make install'. They are not used for any other purpose.
-
-diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk
-index e947989..6805c4e 100644
---- a/utils/unlit/ghc.mk
-+++ b/utils/unlit/ghc.mk
-@@ -13,8 +13,16 @@
- utils/unlit_dist_C_SRCS = unlit.c
- utils/unlit_dist_PROGNAME = unlit
- utils/unlit_dist_TOPDIR = YES
--utils/unlit_dist_INSTALL = YES
-+utils/unlit_dist_INSTALL = NO
- utils/unlit_dist_INSTALL_INPLACE = YES
-
- $(eval $(call build-prog,utils/unlit,dist,0))
-
-+utils/unlit_dist-install_C_SRCS = unlit.c
-+utils/unlit_dist-install_PROGNAME = unlit
-+utils/unlit_dist-install_TOPDIR = YES
-+utils/unlit_dist-install_INSTALL = YES
-+utils/unlit_dist-install_INSTALL_INPLACE = NO
-+
-+# See Note [Why build certain utils twice?].
-+$(eval $(call build-prog,utils/unlit,dist-install,1))