[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk ghc)
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
===
--- PKGBUILD2015-10-06 21:05:35 UTC (rev 248434)
+++ PKGBUILD2015-10-06 23:21:24 UTC (rev 248435)
@@ -1,6 +1,7 @@
# $Id$
-# Maintainer: Thomas Dziedzic
# Maintainer: Vesa Kaihlavirta
+# Contributor: Thomas Dziedzic
+
# 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
+
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk print-provides-replaces.sh)
Date: Monday, March 30, 2015 @ 09:30:38
Author: td123
Revision: 235272
upgpkg: ghc 7.10.1-1
bump
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
ghc/trunk/print-provides-replaces.sh
+
PKGBUILD | 78 +--
build.mk | 222 ---
print-provides-replaces.sh | 13 +-
3 files changed, 207 insertions(+), 106 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-30 01:46:12 UTC (rev 235271)
+++ PKGBUILD2015-03-30 07:30:38 UTC (rev 235272)
@@ -10,7 +10,7 @@
# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
pkgname=ghc
-pkgver=7.8.4
+pkgver=7.10.1
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
@@ -24,33 +24,29 @@
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'
@@ -63,13 +59,9 @@
'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'
@@ -82,12 +74,10 @@
)
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'
-'ghc')
-md5sums=('91f74cf9d813603cc3145528db4bbead'
- '3cc3353d99518be7e7b2d78ebd5460b5'
- 'c367ef26300648ee9b8aca3dee5c9669'
- 'c1d46d86752c50dd85e7143b029fa07f')
+'build.mk')
+md5sums=('f93ad0cdc9df4b0f2d4421debdecb54f'
+ '41db579e247655236c2e35e66e645e71'
+ 'd9c7c61db2b7c0c7eef547092716addb')
build() {
cd ghc-${pkgver}
@@ -111,14 +101,8 @@
# 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
@@ -144,9 +128,7 @@
install -m644 LICENSE \
${pkgdir}/usr/share/licenses/ghc
- # 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/comp
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk silence-gen_contents_index.diff)
Date: Friday, September 7, 2012 @ 00:40:21
Author: tdziedzic
Revision: 166370
bump
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
Deleted:
ghc/trunk/silence-gen_contents_index.diff
-+
PKGBUILD| 107 +-
build.mk| 27 +
silence-gen_contents_index.diff | 10 ---
3 files changed, 76 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-07 01:16:18 UTC (rev 166369)
+++ PKGBUILD2012-09-07 04:40:21 UTC (rev 166370)
@@ -7,7 +7,7 @@
# This implies that all libraries need to be rebuilt when ghc is rebuilt.
pkgname=ghc
-pkgver=7.4.2
+pkgver=7.6.1
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
@@ -21,72 +21,62 @@
# keep this otherwise a lot of tests will show as unexpected failures... need
to investigate why using -jn for n > 1 does this...
#options=('!makeflags')
# missing rtl?
-provides=('haskell-array=0.4.0.0'
- 'haskell-base=4.5.1.0'
- 'haskell-binary=0.5.1.0'
+provides=('haskell-array=0.4.0.1'
+ 'haskell-base=4.6.0.0'
+ 'haskell-binary=0.5.1.1'
'haskell-bin-package-db=0.0.0.0'
- 'haskell-bytestring=0.9.2.1'
- 'haskell-containers=0.4.2.1'
- 'haskell-deepseq=1.3.0.0'
- 'haskell-directory=1.1.0.2'
- 'haskell-extensible-exceptions=0.1.1.4'
- 'haskell-filepath=1.3.0.0'
- 'haskell-ghc-prim=0.2.0.0'
- 'haskell-haskell2010=1.1.0.1'
- 'haskell-haskell98=2.0.0.1'
- 'haskell-hoopl=3.8.7.3'
- 'haskell-hpc=0.5.1.1'
- 'haskell-integer-gmp=0.4.0.0'
- 'haskell-old-locale=1.0.0.4'
- 'haskell-old-time=1.1.0.0'
+ 'haskell-bytestring=0.10.0.0'
+ 'haskell-containers=0.5.0.0'
+ 'haskell-deepseq=1.3.0.1'
+ 'haskell-directory=1.2.0.0'
+ 'haskell-filepath=1.3.0.1'
+ 'haskell-ghc-prim=0.3.0.0'
+ 'haskell-haskell2010=1.1.1.0'
+ 'haskell-haskell98=2.0.0.2'
+ 'haskell-hoopl=3.9.0.0'
+ 'haskell-hpc=0.6.0.0'
+ 'haskell-integer-gmp=0.5.0.0'
+ 'haskell-old-locale=1.0.0.5'
+ 'haskell-old-time=1.1.0.1'
'haskell-pretty=1.1.1.0'
- 'haskell-process=1.1.0.1'
- 'haskell-template-haskell=2.7.0.0'
- 'haskell-time=1.4'
- 'haskell-unix=2.5.1.1'
- 'haskell-cabal=1.14.0'
- )
-replaces=('haskell-array<0.4.0.0'
- 'haskell-base<4.5.1.0'
- 'haskell-binary<0.5.1.0'
+ 'haskell-process=1.1.0.2'
+ 'haskell-template-haskell=2.8.0.0'
+ 'haskell-time=1.4.0.1'
+ 'haskell-unix=2.6.0.0'
+ 'haskell-cabal=1.16.0')
+replaces=('haskell-array<0.4.0.1'
+ 'haskell-base<4.6.0.0'
+ 'haskell-binary<0.5.1.1'
'haskell-bin-package-db<0.0.0.0'
- 'haskell-bytestring<0.9.2.1'
- 'haskell-containers<0.4.2.1'
- 'haskell-deepseq<1.3.0.0'
- 'haskell-directory<1.1.0.2'
- 'haskell-extensible-exceptions<0.1.1.4'
- 'haskell-filepath<1.3.0.0'
- 'haskell-ghc-prim<0.2.0.0'
- 'haskell-haskell2010<1.1.0.1'
- 'haskell-haskell98<2.0.0.1'
- 'haskell-hoopl<3.8.7.3'
- 'haskell-hpc<0.5.1.1'
- 'haskell-integer-gmp<0.4.0.0'
- 'haskell-old-locale<1.0.0.4'
- 'haskell-old-time<1.1.0.0'
+ 'haskell-bytestring<0.10.0.0'
+ 'haskell-containers<0.5.0.0'
+ 'haskell-deepseq<1.3.0.1'
+ 'haskell-directory<1.2.0.0'
+ 'haskell-filepath<1.3.0.1'
+ 'haskell-ghc-prim<0.3.0.0'
+ 'haskell-haskell2010<1.1.1.0'
+ 'haskell-haskell98<2.0.0.2'
+ 'haskell-hoopl<3.9.0.0'
+ 'haskell-hpc<0.6.0.0'
+ 'haskell-integer-gmp<0.5.0.0'
+ 'haskell-old-locale<1.0.0.5'
+ 'haskell-old-time<1.1.0.1'
'haskell-pretty<1.1.1.0'
- 'haskell-process<1.1.0.1'
- 'haskell-template-haskell<2.7.0.0'
- 'haskell-time<1.4'
- 'haskell-unix<2.5.1.1'
- 'haskell-cabal<1.14.0'
- )
+ 'haskell-process<1.1.0.2'
+ 'haskell-template-haskell<2.8.0.0'
+ 'haskell-time<1.4.0.1'
+ 'haskell-unix<2.6.0.0'
+ 'haskell-cabal<1.16.0')
source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2";
"http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2";
-'build.mk'
-'silence-gen_contents_index.diff')
-md5sums=('267462db5c5a7c245fb26361b77007c4'
- '528005749c761fe6c12a0079bd84fb90'
- '88ad4108c26f56fc38466d82aaf9a295'
- '2ac480d025b706fc47acc58c54b246bb')
+'build.mk')
+md5sums=('e9d892d2970550ec5e70130b3621f6b6'
+ '0d93c458e3b445a7e5
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk silence-gen_contents_index.diff)
Date: Sunday, June 10, 2012 @ 20:02:41
Author: tdziedzic
Revision: 161392
upgpkg: ghc 7.4.2-1
bump
Added:
ghc/trunk/silence-gen_contents_index.diff
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
-+
PKGBUILD| 26 --
build.mk|4 ++--
silence-gen_contents_index.diff | 10 ++
3 files changed, 28 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-10 21:12:29 UTC (rev 161391)
+++ PKGBUILD2012-06-11 00:02:41 UTC (rev 161392)
@@ -7,8 +7,8 @@
# This implies that all libraries need to be rebuilt when ghc is rebuilt.
pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
+pkgver=7.4.2
+pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
url='http://www.haskell.org/ghc/'
@@ -22,7 +22,7 @@
options=('!makeflags')
# missing rtl?
provides=('haskell-array=0.4.0.0'
- 'haskell-base=4.5.0.0'
+ 'haskell-base=4.5.1.0'
'haskell-binary=0.5.1.0'
'haskell-bin-package-db=0.0.0.0'
'haskell-bytestring=0.9.2.1'
@@ -43,11 +43,11 @@
'haskell-process=1.1.0.1'
'haskell-template-haskell=2.7.0.0'
'haskell-time=1.4'
- 'haskell-unix=2.5.1.0'
+ 'haskell-unix=2.5.1.1'
'haskell-cabal=1.14.0'
)
replaces=('haskell-array<0.4.0.0'
- 'haskell-base<4.5.0.0'
+ 'haskell-base<4.5.1.0'
'haskell-binary<0.5.1.0'
'haskell-bin-package-db<0.0.0.0'
'haskell-bytestring<0.9.2.1'
@@ -68,19 +68,25 @@
'haskell-process<1.1.0.1'
'haskell-template-haskell<2.7.0.0'
'haskell-time<1.4'
- 'haskell-unix<2.5.1.0'
+ 'haskell-unix<2.5.1.1'
'haskell-cabal<1.14.0'
)
source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2";
"http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2";
-'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
- '54bc9405c14c3226b6e3de3cd61e2777'
- '82b67cdd24a2e434a4399f30f14b21a3')
+'build.mk'
+'silence-gen_contents_index.diff')
+md5sums=('267462db5c5a7c245fb26361b77007c4'
+ '528005749c761fe6c12a0079bd84fb90'
+ '88ad4108c26f56fc38466d82aaf9a295'
+ '2ac480d025b706fc47acc58c54b246bb')
build() {
cd ghc-${pkgver}
+ # Silence gen_contents_index for the common case.
+ # http://hackage.haskell.org/trac/ghc/ticket/5992
+ patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
+
cp ${srcdir}/build.mk mk/build.mk
./configure \
Modified: build.mk
===
--- build.mk2012-06-10 21:12:29 UTC (rev 161391)
+++ build.mk2012-06-11 00:02:41 UTC (rev 161392)
@@ -117,7 +117,7 @@
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
-LAX_DEPENDENCIES = NO
+LAX_DEPENDENCIES = YES
endif
@@ -134,7 +134,7 @@
BUILD_DOCBOOK_HTML = NO
BUILD_DOCBOOK_PS = NO
BUILD_DOCBOOK_PDF = NO
-LAX_DEPENDENCIES = NO
+LAX_DEPENDENCIES = YES
# After stage 1 and the libraries have been built, you can uncomment this line:
Added: silence-gen_contents_index.diff
===
--- silence-gen_contents_index.diff (rev 0)
+++ silence-gen_contents_index.diff 2012-06-11 00:02:41 UTC (rev 161392)
@@ -0,0 +1,10 @@
+--- ghc-7.4.2/libraries/gen_contents_index.original2012-06-10
22:23:28.810059378 +
ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576
+
+@@ -47,7 +47,6 @@
+ esac
+
+ # Now create the combined contents and index pages
+-echo $HADDOCK_ARGS
+ $HADDOCK --gen-index --gen-contents -o . \
+ -t "Haskell Hierarchical Libraries" \
+ -p "prologue.txt" \
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk)
Date: Tuesday, March 23, 2010 @ 02:35:15
Author: vesa
Revision: 73149
back to gmp
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
--+
PKGBUILD |5 ++---
build.mk |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-03-23 04:54:23 UTC (rev 73148)
+++ PKGBUILD2010-03-23 06:35:15 UTC (rev 73149)
@@ -2,12 +2,12 @@
# Maintainer: Vesa Kaihlavirta
pkgname=ghc
pkgver=6.12.1
-pkgrel=3.1
+pkgrel=4
pkgdesc="The Glasgow Haskell Compiler"
arch=(i686 x86_64)
url="http://www.haskell.org/ghc/";
license=("custom")
-depends=(perl)
+depends=(perl gmp>=5.0)
makedepends=(ghc happy perl)
provides=("haskell-array=0.3.0.0"
"haskell-bytestring=0.9.1.5"
@@ -64,7 +64,6 @@
cp ../../build.mk mk/build.mk
./configure --prefix=/usr
- sed -i 's/integer-gmp/integer-simple/' mk/config.mk || return 1
make -j1 || return 1
make DESTDIR=$pkgdir install
Modified: build.mk
===
--- build.mk2010-03-23 04:54:23 UTC (rev 73148)
+++ build.mk2010-03-23 06:35:15 UTC (rev 73149)
@@ -147,4 +147,4 @@
NoFibWays =
STRIP=:
-INTEGER_LIBRARY=integer-simple
+
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk)
Date: Saturday, March 20, 2010 @ 10:43:38
Author: vesa
Revision: 72845
Use integer-simple instead of gmp
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
--+
PKGBUILD |8
build.mk |2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-03-20 13:37:43 UTC (rev 72844)
+++ PKGBUILD2010-03-20 14:43:38 UTC (rev 72845)
@@ -2,12 +2,12 @@
# Maintainer: Vesa Kaihlavirta
pkgname=ghc
pkgver=6.12.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Glasgow Haskell Compiler"
arch=(i686 x86_64)
url="http://www.haskell.org/ghc/";
license=("custom")
-depends=(gmp perl)
+depends=(perl)
makedepends=(ghc happy perl)
provides=("haskell-array=0.3.0.0"
"haskell-bytestring=0.9.1.5"
@@ -53,7 +53,7 @@
)
backup=(usr/lib/ghc-6.12.1/package.conf)
-install=(ghc.install)
+install=ghc.install
source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2";
\
build.mk ghc.install)
@@ -70,5 +70,5 @@
install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
}
md5sums=('3a2b23f29013605f721ebdfc29de9c92'
- '31f83779da0e727dbe536ba671281e47'
+ '864d94bb869dc0d43a37de8669cc976f'
'd03bca6b591043c0fe996d72dd448919')
Modified: build.mk
===
--- build.mk2010-03-20 13:37:43 UTC (rev 72844)
+++ build.mk2010-03-20 14:43:38 UTC (rev 72845)
@@ -146,3 +146,5 @@
# NoFib settings
NoFibWays =
STRIP=:
+
+INTEGER_LIBRARY=integer-simple
[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk)
Date: Sunday, December 13, 2009 @ 01:02:00
Author: vesa
Revision: 61179
bump => 6.12.1
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
--+
PKGBUILD | 23 ++-
build.mk | 93 +++--
2 files changed, 76 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 05:17:07 UTC (rev 61178)
+++ PKGBUILD2009-12-13 06:02:00 UTC (rev 61179)
@@ -1,37 +1,34 @@
# $Id$
# Maintainer: Vesa Kaihlavirta
pkgname=ghc
-pkgver=6.10.4
+pkgver=6.12.1
pkgrel=1
pkgdesc="The Glasgow Haskell Compiler"
arch=(i686 x86_64)
url="http://www.haskell.org/ghc/";
license=("custom")
-depends=(gmp)
+depends=(gmp perl)
makedepends=(ghc happy perl)
provides=(haskell-cabal)
replaces=("haskell-cabal<1.6.0.3")
-backup=(usr/lib/ghc-6.10.4/package.conf)
+backup=(usr/lib/ghc-6.12.1/package.conf)
install=(ghc.install)
source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2";
\
-
"http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2";
+#
"http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2";
build.mk ghc.install)
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
- cp $startdir/build.mk mk/build.mk
+ cp ../../build.mk mk/build.mk
./configure --prefix=/usr
- make -j2 || return 1
- make DESTDIR=$startdir/pkg install
+ make -j1 || return 1
+ make DESTDIR=$pkgdir install
install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
}
-
-
-md5sums=('167687fa582ef6702aaac24e139ec982'
- '37ce285617d7cebabc3cf6805bdbca25'
- 'a05681b982aad44cc6770bd021e35b67'
+md5sums=('3a2b23f29013605f721ebdfc29de9c92'
+ '31f83779da0e727dbe536ba671281e47'
'd03bca6b591043c0fe996d72dd448919')
Modified: build.mk
===
--- build.mk2009-12-13 05:17:07 UTC (rev 61178)
+++ build.mk2009-12-13 06:02:00 UTC (rev 61179)
@@ -16,14 +16,16 @@
# Fast build with optimised libraries:
#BuildFlavour = quick
+# 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
-# Which warnings we like to use
-MyWarningOpts = -W -fno-warn-unused-matches -fwarn-unused-imports
+GhcLibWays = v
# 1. A Performance/Distribution build
@@ -36,20 +38,27 @@
GhcStage2HcOpts = -O2 -fasm
GhcHcOpts = -Rghc-timing
GhcLibHcOpts= -O2 -XGenerics
-GhcLibWays = p
+GhcLibWays += p
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
endif
+endif
+
# A Fast build --
ifeq "$(BuildFlavour)" "quickest"
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts= -O0 -fasm
-GhcLibWays =
-SplitObjs = NO
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O0 -fasm
+GhcLibHcOpts = -O0 -fasm
+SplitObjs = NO
+HADDOCK_DOCS = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS = NO
+BUILD_DOCBOOK_PDF = NO
endif
@@ -57,25 +66,52 @@
ifeq "$(BuildFlavour)" "quick"
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts= -O -fasm
-GhcLibWays =
-SplitObjs = NO
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O0 -fasm
+GhcLibHcOpts = -O -fasm
+SplitObjs = NO
+HADDOCK_DOCS = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS = NO
+BUILD_DOCBOOK_PDF = NO
endif
+# Profile the stage2 compiler ---
+
+ifeq "$(BuildFlavour)" "prof"
+
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O -fasm
+GhcLibHcOpts = -O -fasm
+
+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 -fasm $(MyWarningOpts)
-GhcLibHcOpts= -O -dcore-lint $(MyWarningOpts)
-GhcLibWays =
-GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts = -Rghc-timing -O -fasm
-SplitObjs = NO
+SRC_HC_OPTS= -H64m -O -fasm
+GhcLibHcOpts = -O -dcore-lint
+GhcStage1HcOpts= -Rghc-timing -O0 -DDEBUG
+GhcStage2HcOpts= -Rghc-timing -O -fasm
+SplitObjs = NO
+HADDOCK_DOCS = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS = NO
+BUILD_DOCBOOK_PDF = NO
endif
@@ -83,12 +119,15 @@
i
