extra/ghc to 7.10.1-1

This commit is contained in:
Kevin Mihelich 2015-04-06 05:11:07 +00:00
parent e0609e2561
commit d5a2b22aef
4 changed files with 187 additions and 107 deletions

View file

@ -21,7 +21,7 @@
noautobuild=1
pkgname=ghc
pkgver=7.8.4
pkgver=7.10.1
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
@ -35,34 +35,30 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
checkdepends=('python2')
install='ghc.install'
options=('staticlibs')
provides=('haskell-array=0.5.0.0'
'haskell-base=4.7.0.2'
'haskell-binary=0.7.1.0'
provides=('haskell-array=0.5.1.0'
'haskell-base=4.8.0.0'
'haskell-binary=0.7.3.0'
'haskell-bin-package-db=0.0.0.0'
'haskell-bytestring=0.10.4.0'
'haskell-containers=0.5.5.1'
'haskell-deepseq=1.3.0.2'
'haskell-directory=1.2.1.0'
'haskell-filepath=1.3.0.2'
'haskell-ghc-prim=0.3.1.0'
'haskell-haskeline=0.7.1.2'
'haskell-haskell2010=1.1.2.0'
'haskell-haskell98=2.0.0.3'
'haskell-hoopl=3.10.0.1'
'haskell-hpc=0.6.0.1'
'haskell-integer-gmp=0.5.1.0'
'haskell-old-locale=1.0.0.6'
'haskell-old-time=1.1.0.2'
'haskell-pretty=1.1.1.1'
'haskell-process=1.2.0.0'
'haskell-template-haskell=2.9.0.0'
'haskell-terminfo=0.4.0.0'
'haskell-time=1.4.2'
'haskell-transformers=0.3.0.0'
'haskell-unix=2.7.0.1'
'haskell-bytestring=0.10.6.0'
'haskell-containers=0.5.6.2'
'haskell-deepseq=1.4.1.1'
'haskell-directory=1.2.2.0'
'haskell-filepath=1.4.0.0'
'haskell-ghc-prim=0.4.0.0'
'haskell-haskeline=0.7.2.1'
'haskell-hoopl=3.10.0.2'
'haskell-hpc=0.6.0.2'
'haskell-integer-gmp=1.0.0.0'
'haskell-pretty=1.1.2.0'
'haskell-process=1.2.3.0'
'haskell-template-haskell=2.10.0.0'
'haskell-terminfo=0.4.0.1'
'haskell-time=1.5.0.1'
'haskell-transformers=0.4.2.0'
'haskell-unix=2.7.1.0'
'haskell-xhtml=3000.2.1'
'haskell-cabal=1.18.1.5'
)
'haskell-cabal=1.22.2.0'
)
replaces=('haskell-array'
'haskell-base'
'haskell-binary'
@ -74,13 +70,9 @@ replaces=('haskell-array'
'haskell-filepath'
'haskell-ghc-prim'
'haskell-haskeline'
'haskell-haskell2010'
'haskell-haskell98'
'haskell-hoopl'
'haskell-hpc'
'haskell-integer-gmp'
'haskell-old-locale'
'haskell-old-time'
'haskell-pretty'
'haskell-process'
'haskell-template-haskell'
@ -97,9 +89,9 @@ source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
'ghc'
'add-vfp-flags.patch'
'ghc-7.8.1-mk-config.mk.in-ARM-dynlinking.patch')
md5sums=('91f74cf9d813603cc3145528db4bbead'
'3cc3353d99518be7e7b2d78ebd5460b5'
'b622685c767d0b054c92d1432708d516'
md5sums=('f93ad0cdc9df4b0f2d4421debdecb54f'
'41db579e247655236c2e35e66e645e71'
'd9c7c61db2b7c0c7eef547092716addb'
'c1d46d86752c50dd85e7143b029fa07f'
'1eb0ed10fa9676c2e23a587c40166e0e'
'041b801ef32c45c7c9fd8d7730e79cc8')
@ -133,14 +125,8 @@ check() {
# python2 rename
sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
# Unexpected failures:
# codeGen/should_run T8256 [exit code non-0] (normal)
# concurrent/should_run T9379 [exit code non-0] (normal)
# perf/compiler T3064 [stat not good enough] (normal)
# perf/compiler T4801 [stat not good enough] (normal)
# perf/compiler T6048 [stat not good enough] (optasm)
# roles/should_compile T8958 [stderr mismatch] (normal)
make test
# tests check out for 7.10.1 on x86_64 but are broken on i686
#make test
# enabling threads to speed up
# causes more failures than make test, need to investigate
@ -169,9 +155,7 @@ package() {
sed -r 's|("C compiler command", ")[^"]+|\1/usr/bin/gcc|' \
-i "${pkgdir}/usr/lib/ghc-${pkgver}/settings"
# provide non vanilla bash completion since ghc currently doesn't ship with any:
# https://ghc.haskell.org/trac/ghc/ticket/9005
install -d ${pkgdir}/usr/share/bash-completion/completions
install -m644 ${srcdir}/ghc \
${pkgdir}/usr/share/bash-completion/completions
install -m644 ./utils/completion/ghc.bash \
${pkgdir}/usr/share/bash-completion/completions/ghc
}

View file

@ -5,6 +5,7 @@
# overall build type, and then tweak the options in the relevant section
# below.
# -------- Build profiles -----------------------------------------------------
# Uncomment one of these to select a build profile below:
# Full build with max optimisation and everything enabled (very slow build)
@ -13,9 +14,18 @@
# As above but build GHC using the LLVM backend
BuildFlavour = perf-llvm
# Perf build configured for a cross-compiler
#BuildFlavour = perf-cross
# Fast build with optimised libraries, no profiling (RECOMMENDED):
#BuildFlavour = quick
# Fast build with optimised libraries, no profiling, with LLVM:
#BuildFlavour = quick-llvm
# Fast build configured for a cross compiler
#BuildFlavour = quick-cross
# Even faster build. NOT RECOMMENDED: the libraries will be
# completely unoptimised, so any code built with this compiler
# (including stage2) will run very slowly:
@ -30,20 +40,49 @@ BuildFlavour = perf-llvm
# A development build, working on the stage 2 compiler:
#BuildFlavour = devel2
# An unregisterised, optimised build of ghc, for porting:
#BuildFlavour = unreg
# A build with max optimisation that still builds the stage2 compiler
# quickly. Compiled code will be the same as with "perf". Programs
# will compile more slowly.
#BuildFlavour = bench
GhcLibWays = v
# As above but build GHC using the LLVM backend
#BuildFlavour = bench-llvm
# -------- 1. A Performance/Distribution build--------------------------------
# Bench build configured for a cross-compiler
#BuildFlavour = bench-cross
# -------- Miscellaneous variables --------------------------------------------
# Set to V = 0 to get prettier build output.
# Please use V = 1 when reporting GHC bugs.
V = 1
# After stage 1 and the libraries have been built, you can uncomment this line:
#stage=2
# Then stage 1 will not be touched by the build system, until
# you comment the line again. This is a useful trick for when you're
# working on stage 2 and want to freeze stage 1 and the libraries for
# a while.
# Uncomment the following line to enable building DPH
#BUILD_DPH=YES
GhcLibWays = $(if $(filter $(DYNAMIC_GHC_PROGRAMS),YES),v dyn,v)
# Only use -fasm by default on platforms that support it.
GhcFAsm = $(if $(filter $(GhcWithNativeCodeGen),YES),-fasm,)
# ----------- A Performance/Distribution build --------------------------------
ifeq "$(BuildFlavour)" "perf"
# perf matches the default settings, repeated here for comparison:
SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O2 -fasm
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O2 $(GhcFAsm)
GhcHcOpts = -Rghc-timing
GhcLibHcOpts = -O2
GhcLibWays += p
@ -54,7 +93,7 @@ endif
endif
# ---------------- Perf build using LLVM -------------------------------------
# ---------------- Perf build using LLVM --------------------------------------
ifeq "$(BuildFlavour)" "perf-llvm"
@ -65,20 +104,16 @@ GhcHcOpts = -Rghc-timing
GhcLibHcOpts = -O2
GhcLibWays += p
ifeq "$(PlatformSupportsSharedLibs)" "YES"
GhcLibWays += dyn
endif
endif
# -------- A Fast build ------------------------------------------------------
# -------- A Fast build -------------------------------------------------------
ifeq "$(BuildFlavour)" "quickest"
SRC_HC_OPTS = -H64m -O0 -fasm
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O0 -fasm
GhcLibHcOpts = -O0 -fasm
SRC_HC_OPTS = -H64m -O0 $(GhcFAsm)
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O0 $(GhcFAsm)
GhcLibHcOpts = -O0 $(GhcFAsm)
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
@ -87,14 +122,14 @@ BUILD_DOCBOOK_PDF = NO
endif
# -------- A Fast build with optimised libs ----------------------------------
# -------- A Fast build with optimised libs -----------------------------------
ifeq "$(BuildFlavour)" "quick"
SRC_HC_OPTS = -H64m -O0 -fasm
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O0 -fasm
GhcLibHcOpts = -O -fasm
SRC_HC_OPTS = -H64m -O0 $(GhcFAsm)
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O0 $(GhcFAsm)
GhcLibHcOpts = -O $(GhcFAsm)
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
@ -103,14 +138,51 @@ BUILD_DOCBOOK_PDF = NO
endif
# -------- Profile the stage2 compiler ---------------------------------------
# -------- A Fast build with optimised libs using LLVM ------------------------
ifeq "$(BuildFlavour)" "quick-llvm"
SRC_HC_OPTS = -H64m -O0 -fllvm
GhcStage1HcOpts = -O -fllvm
GhcStage2HcOpts = -O0 -fllvm
GhcLibHcOpts = -O -fllvm
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
endif
# -------- A Fast build configured for cross-compilation ----------------------
ifeq "$(BuildFlavour)" "quick-cross"
SRC_HC_OPTS = -H64m -O0
GhcStage1HcOpts = -O
GhcStage2HcOpts = -O0 -fllvm
GhcLibHcOpts = -O -fllvm
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
INTEGER_LIBRARY = integer-simple
Stage1Only = YES
DYNAMIC_BY_DEFAULT = NO
DYNAMIC_GHC_PROGRAMS = NO
endif
# -------- Profile the stage2 compiler ----------------------------------------
ifeq "$(BuildFlavour)" "prof"
SRC_HC_OPTS = -H64m -O0 -fasm
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O -fasm
GhcLibHcOpts = -O -fasm
SRC_HC_OPTS = -H64m -O0 $(GhcFAsm)
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O $(GhcFAsm)
GhcLibHcOpts = -O $(GhcFAsm)
GhcLibWays += p
GhcProfiled = YES
@ -123,15 +195,14 @@ BUILD_DOCBOOK_PDF = NO
endif
# -------- A Development build (stage 1) -------------------------------------
# -------- A Development build (stage 1) --------------------------------------
ifeq "$(BuildFlavour)" "devel1"
SRC_HC_OPTS = -H64m -O -fasm
SRC_HC_OPTS = -H64m -O $(GhcFAsm)
GhcLibHcOpts = -O -dcore-lint
GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
GhcStage2HcOpts = -Rghc-timing -O -fasm
GhcStage2HcOpts = -Rghc-timing -O $(GhcFAsm)
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
@ -141,13 +212,13 @@ LAX_DEPENDENCIES = YES
endif
# -------- A Development build (stage 2) -------------------------------------
# -------- A Development build (stage 2) --------------------------------------
ifeq "$(BuildFlavour)" "devel2"
SRC_HC_OPTS = -H64m -O -fasm
SRC_HC_OPTS = -H64m -O $(GhcFAsm)
GhcLibHcOpts = -O -dcore-lint
GhcStage1HcOpts = -Rghc-timing -O -fasm
GhcStage1HcOpts = -Rghc-timing -O $(GhcFAsm)
GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
SplitObjs = NO
HADDOCK_DOCS = NO
@ -156,38 +227,58 @@ BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
LAX_DEPENDENCIES = YES
# After stage 1 and the libraries have been built, you can uncomment this line:
endif
# stage=2
# -------- A bench build with optimised libs -----------------------------------
# Then stage 1 will not be touched by the build system, until
# you comment the line again. This is a useful trick for when you're
# working on stage 2 and want to freeze stage 1 and the libraries for
# a while.
ifeq "$(BuildFlavour)" "bench"
SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O0 $(GhcFAsm)
GhcLibHcOpts = -O2 $(GhcFAsm)
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
endif
# -------- A Unregisterised build) -------------------------------------------
# ---------------- Bench build using LLVM --------------------------------------
ifeq "$(BuildFlavour)" "unreg"
ifeq "$(BuildFlavour)" "bench-llvm"
# Note that the LLVM backend works in unregisterised mode as well as
# registerised mode. This often makes it a good choice for porting
# GHC.
SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O -fllvm
GhcStage2HcOpts = -O0 -fllvm
GhcLibHcOpts = -O2 -fllvm
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
GhcUnregisterised = YES
GhcWithNativeCodeGen = NO
endif
SRC_HC_OPTS = -O -H64m # -fllvm
GhcStage1HcOpts = -O
GhcStage2HcOpts = -O2
GhcHcOpts = -Rghc-timing
GhcLibHcOpts = -O2
SplitObjs = NO
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
# ------- A Bench build configured for cross-compilation ----------------------
ifeq "$(BuildFlavour)" "bench-cross"
SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O $(GhcFAsm)
GhcStage2HcOpts = -O0 $(GhcFAsm)
GhcLibHcOpts = -O2 $(GhcFAsm)
SplitObjs = NO
INTEGER_LIBRARY = integer-simple
Stage1Only = YES
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
DYNAMIC_BY_DEFAULT = NO
DYNAMIC_GHC_PROGRAMS = NO
endif

View file

@ -6,5 +6,5 @@ pre_upgrade() {
post_upgrade() {
echo '==> All cabalized packages need to be reinstalled now.'
echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
echo '==> See /usr/share/haskell/ for a tentative list of affected packages.'
}

View file

@ -12,6 +12,8 @@ declare -A exclude
exclude['Win32']=1
# no integer-simple because we use integer-gmp
exclude['integer-simple']=1
# integer-gmp was replaced with integer-gmp2
exclude['integer-gmp']=1
# extract excluded libraries from ghc.mk
for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
exclude[${exclude_pkg}]=1
@ -23,10 +25,13 @@ cd src/ghc-${pkgver}/libraries
# $2 is the string for the test, either '=' or '<'
print_var() {
printf "$1=("
for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
[[ ${exclude[${pkg}]} ]] && continue
version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
printf "'haskell-$pkg"
for path in $(ls ./*/*.cabal); do
dirname=$(echo $path | awk -F '/' '{ print $2 }')
cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
cabalname=$(basename $cabalfile .cabal)
[[ ${exclude[${dirname}]} ]] && continue
version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
printf "'haskell-$cabalname"
[[ -n "$2" ]] && printf "$2$version"
printf "'\n "
done