[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk ghc)
Evangelos Foutras
foutrelis at archlinux.org
Tue Oct 6 23:21:24 UTC 2015
Date: Wednesday, October 7, 2015 @ 01:21:24
Author: foutrelis
Revision: 248435
upgpkg: ghc 7.10.2-1
- New upstream release.
- Remove empty check().
Modified:
ghc/trunk/PKGBUILD
Deleted:
ghc/trunk/build.mk
ghc/trunk/ghc
----------+
PKGBUILD | 95 ++++++------------
build.mk | 314 -------------------------------------------------------------
ghc | 10 -
3 files changed, 34 insertions(+), 385 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-06 21:05:35 UTC (rev 248434)
+++ PKGBUILD 2015-10-06 23:21:24 UTC (rev 248435)
@@ -1,6 +1,7 @@
# $Id$
-# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+
# Special note for devs looking to upgrade this package:
# ghc places a unique hash for each library when it is built.
# Libraries depend on versions specified by those hashes.
@@ -10,8 +11,8 @@
# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
pkgname=ghc
-pkgver=7.10.1
-pkgrel=2
+pkgver=7.10.2
+pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
url='http://www.haskell.org/ghc/'
@@ -18,15 +19,9 @@
license=('custom')
depends=('perl' 'gmp' 'gcc' 'libffi')
makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-# will hopefully be able to depend on python 3 in a future version
-# https://ghc.haskell.org/trac/ghc/ticket/9184
-# title: Allow the use of Python 3 when building GHC
-checkdepends=('python2')
-install='ghc.install'
-options=('staticlibs')
provides=('haskell-array=0.5.1.0'
- 'haskell-base=4.8.0.0'
- 'haskell-binary=0.7.3.0'
+ 'haskell-base=4.8.1.0'
+ 'haskell-binary=0.7.5.0'
'haskell-bin-package-db=0.0.0.0'
'haskell-bytestring=0.10.6.0'
'haskell-containers=0.5.6.2'
@@ -46,8 +41,7 @@
'haskell-transformers=0.4.2.0'
'haskell-unix=2.7.1.0'
'haskell-xhtml=3000.2.1'
- 'haskell-cabal=1.22.2.0'
- )
+ 'haskell-cabal=1.22.4.0')
replaces=('haskell-array'
'haskell-base'
'haskell-binary'
@@ -70,65 +64,44 @@
'haskell-transformers'
'haskell-unix'
'haskell-xhtml'
- 'haskell-cabal'
- )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
- "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
- 'build.mk')
-md5sums=('f93ad0cdc9df4b0f2d4421debdecb54f'
- '41db579e247655236c2e35e66e645e71'
- 'd9c7c61db2b7c0c7eef547092716addb')
+ 'haskell-cabal')
+install='ghc.install'
+options=('staticlibs')
+source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgname-$pkgver-src.tar.xz")
+noextract=("$pkgname-$pkgver-src.tar.xz")
+md5sums=('fc1269fbc52513fa6b2ae6051c365bc3')
+prepare() {
+ # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C"
+ # locale; otherwise we get:
+ # bsdtar: Pathname can't be converted from UTF-8 to current locale.
+ LANG=en_US.UTF-8 bsdtar xf $pkgname-$pkgver-src.tar.xz
+
+ cd ghc-$pkgver
+
+ # We select the following build profile:
+ # Full build with max optimisation and everything enabled (very slow build)
+ cp mk/build.mk{.sample,}
+ sed -i '1iBuildFlavour = perf' mk/build.mk
+}
+
build() {
- cd ghc-${pkgver}
+ cd ghc-$pkgver
- cp ${srcdir}/build.mk mk/build.mk
-
./configure \
--prefix=/usr \
--with-system-libffi \
- --with-ffi-includes=/usr/lib/libffi-3.2.1/include
-
+ --with-ffi-includes=$(pkg-config --variable=includedir libffi)
make
}
-check() {
- # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
- unset MAKEFLAGS
-
- cd ghc-${pkgver}
-
- # python2 rename
- sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
- # 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
- # upstream known failures on both i686 and x86_64:
- # perf/compiler parsing001 [stat not good enough] (normal)
- # simplCore/should_compile spec-inline [stderr mismatch] (optasm)
- # upstream known failures on i686 only:
- # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
- #make THREADS=9 test
-
- # will most likely cause lots of failures
- # enable this when upstream has 0 test failures from a simple 'make test'
- # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
- #make fulltest
-}
-
package() {
- cd ghc-${pkgver}
+ cd ghc-$pkgver
- make DESTDIR=${pkgdir} install
+ make DESTDIR="$pkgdir" install
- install -d ${pkgdir}/usr/share/licenses/ghc
- install -m644 LICENSE \
- ${pkgdir}/usr/share/licenses/ghc
+ install -Dm644 utils/completion/ghc.bash \
+ "$pkgdir/usr/share/bash-completion/completions/ghc"
- install -d ${pkgdir}/usr/share/bash-completion/completions
- install -m644 ./utils/completion/ghc.bash \
- ${pkgdir}/usr/share/bash-completion/completions/ghc
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
Deleted: build.mk
===================================================================
--- build.mk 2015-10-06 21:05:35 UTC (rev 248434)
+++ build.mk 2015-10-06 23:21:24 UTC (rev 248435)
@@ -1,314 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# 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)
-BuildFlavour = perf
-
-# 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:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# 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
-
-# As above but build GHC using the LLVM backend
-#BuildFlavour = bench-llvm
-
-# 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 $(GhcFAsm)
-GhcStage2HcOpts = -O2 $(GhcFAsm)
-GhcHcOpts = -Rghc-timing
-GhcLibHcOpts = -O2
-GhcLibWays += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# ---------------- Perf build using LLVM --------------------------------------
-
-ifeq "$(BuildFlavour)" "perf-llvm"
-
-SRC_HC_OPTS = -O -H64m -fllvm
-GhcStage1HcOpts = -O -fllvm
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts = -Rghc-timing
-GhcLibHcOpts = -O2
-GhcLibWays += p
-
-endif
-
-# ------- A Perf build configured for cross-compilation ----------------------
-
-ifeq "$(BuildFlavour)" "perf-cross"
-
-SRC_HC_OPTS = -O -H64m -fllvm
-GhcStage1HcOpts = -O2
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts = -Rghc-timing
-GhcLibHcOpts = -O2
-GhcLibWays += p
-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
-
-# -------- A Fast build -------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS = -H64m -O0 $(GhcFAsm)
-GhcStage1HcOpts = -O $(GhcFAsm)
-GhcStage2HcOpts = -O0 $(GhcFAsm)
-GhcLibHcOpts = -O0 $(GhcFAsm)
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- A Fast build with optimised libs -----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS = -H64m -O0 $(GhcFAsm)
-GhcStage1HcOpts = -O $(GhcFAsm)
-GhcStage2HcOpts = -O0 $(GhcFAsm)
-GhcLibHcOpts = -O $(GhcFAsm)
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- 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 $(GhcFAsm)
-GhcStage1HcOpts = -O $(GhcFAsm)
-GhcStage2HcOpts = -O $(GhcFAsm)
-GhcLibHcOpts = -O $(GhcFAsm)
-
-GhcLibWays += p
-GhcProfiled = YES
-
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- A Development build (stage 1) --------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS = -H64m -O $(GhcFAsm)
-GhcLibHcOpts = -O -dcore-lint
-GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts = -Rghc-timing -O $(GhcFAsm)
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-LAX_DEPENDENCIES = YES
-
-endif
-
-# -------- A Development build (stage 2) --------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS = -H64m -O $(GhcFAsm)
-GhcLibHcOpts = -O -dcore-lint
-GhcStage1HcOpts = -Rghc-timing -O $(GhcFAsm)
-GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-LAX_DEPENDENCIES = YES
-
-endif
-
-# -------- A bench build with optimised libs -----------------------------------
-
-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
-
-# ---------------- Bench build using LLVM --------------------------------------
-
-ifeq "$(BuildFlavour)" "bench-llvm"
-
-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
-
-endif
-
-# ------- 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
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
-
Deleted: ghc
===================================================================
--- ghc 2015-10-06 21:05:35 UTC (rev 248434)
+++ ghc 2015-10-06 23:21:24 UTC (rev 248435)
@@ -1,10 +0,0 @@
-_ghc()
-{
- local envs=`ghc --show-options`
- # get the word currently being completed
- local cur=${COMP_WORDS[$COMP_CWORD]}
-
- # the resulting completions should be put into this array
- COMPREPLY=( $( compgen -W "$envs" -- $cur ) )
-}
-complete -F _ghc -o default ghc
More information about the arch-commits
mailing list