diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-13 14:02:08 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-13 14:38:02 +0200 |
| commit | 8f4dda4aa062e44200b4e8457e6cc7244ed6c362 (patch) | |
| tree | 8eac577a95e14d5f309768653e1b44eb4a11e69c | |
| parent | 20fb208e2d61ef333f0ae1481eb687b6f641f59a (diff) | |
| download | aports-8f4dda4aa062e44200b4e8457e6cc7244ed6c362.tar.bz2 aports-8f4dda4aa062e44200b4e8457e6cc7244ed6c362.tar.xz | |
testing/ghc-bootstrap: updated to reflect actual bootstrap run
| -rw-r--r-- | testing/ghc-bootstrap/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/ghc-bootstrap/Dockerfile.x86_64 | 4 | ||||
| -rw-r--r-- | testing/ghc-bootstrap/gmpurl.patch | 12 |
3 files changed, 6 insertions, 20 deletions
diff --git a/testing/ghc-bootstrap/APKBUILD b/testing/ghc-bootstrap/APKBUILD index 7642dfb600..85d2a8c271 100644 --- a/testing/ghc-bootstrap/APKBUILD +++ b/testing/ghc-bootstrap/APKBUILD @@ -11,17 +11,15 @@ pkgname=ghc-bootstrap pkgver=8.0.2 pkgrel=0 pkgdesc="The Glasgow haskell compiler (bootstrapped)" -arch="x86_64 armhf" +#arch="x86_64" license="custom:bsd3" url="https://haskell.org" depends="bash libffi musl zlib gcc binutils-gold llvm3.7" install="" subpackages="" makedepends="" -source=" - http://dev.alpinelinux.org/archive/ghc-bootstrap/ghc-$pkgver-armhf.tar.xz - http://dev.alpinelinux.org/archive/ghc-bootstrap/ghc-$pkgver-x86_64.tar.xz -" +source="http://dev.alpinelinux.org/archive/ghc-bootstrap/ghc-$pkgver-x86_64.tar.xz + " # The bootstrap process uses docker to build ghc from a debian glibc host # then upload the bootstrap compiler to where that source url is. @@ -52,3 +50,5 @@ package() { sed -i 's|/usr/.*/llc|llc-3.7|' "$settings" || return 1 sed -i 's|/usr/.*/opt|opt-3.7|' "$settings" || return 1 } + +sha512sums="84404cd23677755e010e90c357e7eea940524531ae82bd70d215fda61fc63c1ef4c367b3fe7a938e8d8f415d8130ae98e77eee122450a80b41099b623fa99f9f ghc-8.0.2-x86_64.tar.xz" diff --git a/testing/ghc-bootstrap/Dockerfile.x86_64 b/testing/ghc-bootstrap/Dockerfile.x86_64 index b18ef92b47..997bbd0fd3 100644 --- a/testing/ghc-bootstrap/Dockerfile.x86_64 +++ b/testing/ghc-bootstrap/Dockerfile.x86_64 @@ -96,9 +96,7 @@ run echo GCC_BUILTIN_PREREQS=yes >> config.sh && \ echo MAKEFLAGS=-j$(grep -c processor /proc/cpuinfo) >> config.sh && \ echo "BINUTILS_CONFFLAGS='CXXFLAGS=-fpermissive --enable-gold --enable-plugins --disable-werror'" >> config.sh && \ echo "CFLAGS='-g -O3 -fno-pie -fno-pic'" >> config.sh -copy gmpurl.patch gmpurl.patch -run patch -p1 < gmpurl.patch && \ - ./build.sh && \ +run ./build.sh && \ rm -fr /tmp/musl-cross add http://downloads.haskell.org/~ghc/$ghc/ghc-$ghc-src.tar.xz /tmp/ diff --git a/testing/ghc-bootstrap/gmpurl.patch b/testing/ghc-bootstrap/gmpurl.patch deleted file mode 100644 index 3f8b4e5ccc..0000000000 --- a/testing/ghc-bootstrap/gmpurl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r d72695b410e3 defs.sh ---- a/defs.sh Sun Jul 26 15:38:58 2015 -0400 -+++ b/defs.sh Sun Jan 31 23:18:18 2016 +0000 -@@ -221,7 +221,7 @@ - gccprereqs() { - if [ ! -e gcc-$GCC_VERSION/gmp ] - then -- fetchextract http://gmplib.org/download/gmp/archive/ gmp-$GMP_VERSION .tar.bz2 -+ fetchextract http://gmplib.org/download/gmp/ gmp-$GMP_VERSION .tar.bz2 - mv gmp-$GMP_VERSION gcc-$GCC_VERSION/gmp - fi - |