diff --git a/.gitattributes b/.gitattributes index 7a752f0..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -ghc-bootstrap-7.8.3.tar filter=lfs diff=lfs merge=lfs -text diff --git a/README.openSUSE b/README.openSUSE index 1e21312..f49cc8e 100644 --- a/README.openSUSE +++ b/README.openSUSE @@ -2,16 +2,16 @@ Generating binary distributions for ghc bootstrap in Factory ============================================================ 1. Download source distribution from http://www.haskell.org/ghc/download -2. Apply patches for openSUSE +2. If necessary, apply patches for openSUSE * https://build.opensuse.org/package/show/devel:languages:haskell:bootstrap/ghc-prepare-binary-distributions 3. Build binary distribution `make binary-dist` 4. Download rpms from: - * https://build.opensuse.org/package/binaries/devel:languages:haskell:bootstrap/ghc-prepare-binary-distributions?repository=openSUSE_Factory * https://build.opensuse.org/package/binaries/devel:languages:haskell:bootstrap/ghc-prepare-binary-distributions?repository=openSUSE_Factory_PowerPC_standard + * https://build.opensuse.org/package/binaries/devel:languages:haskell:bootstrap/ghc-prepare-binary-distributions?repository=openSUSE_Factory_zSystems 5. Extract tarball `rpm2cpio ghc-prepare-binary-distributions*.rpm | cpio -idmv` 6. Copy tarball to project devel:languages:haskell:compiler/ghc-bootstrap Note: ===== -The ix86 and x86_64 tarballs were taken from upstream. -https://www.haskell.org/ghc/download_ghc_7_8_3 +The armv7, aarch64, i386, and x86_64 tarballs were taken from upstream. +See: https://www.haskell.org/ghc/download_ghc_8_2_1.html diff --git a/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2 b/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2 deleted file mode 100644 index 7470c08..0000000 --- a/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38c61b7535644dbc0fc0e484752e1f3db6326569663658a93cb609e8ad05feaa -size 120180306 diff --git a/ghc-7.8.3-powerpc-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc-unknown-linux.tar.bz2 deleted file mode 100644 index 7bc169b..0000000 --- a/ghc-7.8.3-powerpc-unknown-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e7baa80ecdb263ec8c577760817b16d32ba73ba0ebd48004d7a69899e826496 -size 60476033 diff --git a/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2 deleted file mode 100644 index 1c98cf4..0000000 --- a/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcf0af948d9146141347b4ac21ce604c63f84034cf993a8e147e4d8ce387bf12 -size 87051271 diff --git a/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2 deleted file mode 100644 index 7708a6d..0000000 --- a/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5e2c51664c7db740be79c882c72fcd16036f84dff1b65ab0e9749b882ed31b6 -size 107100129 diff --git a/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2 b/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2 deleted file mode 100644 index 88fdae2..0000000 --- a/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7561f2685063a49e46430050c057e801f210cc56c7fb2cab0951a6444a72c4f7 -size 113299736 diff --git a/ghc-7.8.4-aarch64-unknown-linux.tar.bz2 b/ghc-7.8.4-aarch64-unknown-linux.tar.bz2 deleted file mode 100644 index 926f293..0000000 --- a/ghc-7.8.4-aarch64-unknown-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7719ee27ae756eae2458bb8ade69a8c29c28d26d6ea8be36a73e5d003dd7024a -size 87692219 diff --git a/ghc-7.8.4-s390-ibm-linux.tar.bz2 b/ghc-7.8.4-s390-ibm-linux.tar.bz2 deleted file mode 100644 index e3e7c91..0000000 --- a/ghc-7.8.4-s390-ibm-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc7cb331aa41ff4c19fba1b72e1847533070d62d022ff282058a8d5969c49630 -size 100269236 diff --git a/ghc-7.8.4-s390x-ibm-linux.tar.bz2 b/ghc-7.8.4-s390x-ibm-linux.tar.bz2 deleted file mode 100644 index 085145b..0000000 --- a/ghc-7.8.4-s390x-ibm-linux.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dde3e49eadcd8e537563b5925c2f0321f7a44b05826223aee2aa836e68bf7b46 -size 97006937 diff --git a/ghc-8.2.1-aarch64-deb8-linux.tar.xz b/ghc-8.2.1-aarch64-deb8-linux.tar.xz new file mode 100644 index 0000000..496a2b1 --- /dev/null +++ b/ghc-8.2.1-aarch64-deb8-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2 +size 163469920 diff --git a/ghc-8.2.1-armv7-deb8-linux.tar.xz b/ghc-8.2.1-armv7-deb8-linux.tar.xz new file mode 100644 index 0000000..2707b58 --- /dev/null +++ b/ghc-8.2.1-armv7-deb8-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019 +size 173741784 diff --git a/ghc-8.2.1-i386-deb8-linux.tar.xz b/ghc-8.2.1-i386-deb8-linux.tar.xz new file mode 100644 index 0000000..b7217f0 --- /dev/null +++ b/ghc-8.2.1-i386-deb8-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e +size 122702996 diff --git a/ghc-8.2.1-powerpc64-unknown-linux.tar.xz b/ghc-8.2.1-powerpc64-unknown-linux.tar.xz new file mode 100644 index 0000000..abf4c91 --- /dev/null +++ b/ghc-8.2.1-powerpc64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adb4343013ad13f14567b41a141e541ca5804e9d5ff9d41d3fbee467f8fefab2 +size 117695016 diff --git a/ghc-8.2.1-powerpc64le-unknown-linux.tar.xz b/ghc-8.2.1-powerpc64le-unknown-linux.tar.xz new file mode 100644 index 0000000..c1a76cf --- /dev/null +++ b/ghc-8.2.1-powerpc64le-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3c16ab1e45eb680352198c719ca30cdcefafe6c2fce8bc055714722cc2e1696 +size 118447484 diff --git a/ghc-8.2.1-s390x-ibm-linux.tar.xz b/ghc-8.2.1-s390x-ibm-linux.tar.xz new file mode 100644 index 0000000..ed59071 --- /dev/null +++ b/ghc-8.2.1-s390x-ibm-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fbb61b67986efb7784a760d8e5074bb44496fbb3878ab13aeb2caf6a06ced4d +size 135274992 diff --git a/ghc-8.2.1-x86_64-deb8-linux.tar.xz b/ghc-8.2.1-x86_64-deb8-linux.tar.xz new file mode 100644 index 0000000..632baa2 --- /dev/null +++ b/ghc-8.2.1-x86_64-deb8-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130 +size 126809836 diff --git a/ghc-bootstrap-7.8.3.tar b/ghc-bootstrap-7.8.3.tar deleted file mode 100644 index f37a743..0000000 --- a/ghc-bootstrap-7.8.3.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ceec3278ddaf2c71a879710026c2669acb31e3681f728ce5f0f2e506ef07f871 -size 10240 diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 3dd0fd2..42f6e1d 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 24 11:15:31 UTC 2017 - peter.trommler@ohm-hochschule.de + +- update to 8.2.1 on all arches +* required to bootstrap ghc 8.2.1 +* drop support for ppc and s390 +* add support for arm7l +* add support for registerised LLVM backend on aarch64 +- update instructions to produce bindists +- remove libgmp hack, upstream bindists link against new libgmp + ------------------------------------------------------------------- Sun Mar 5 15:27:59 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index 746009c..fe50c9e 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -18,7 +18,6 @@ %ifarch %{ix86} %define longarch i386 -%define os_release -centos65 %endif %ifarch ppc %define longarch powerpc @@ -38,51 +37,53 @@ %ifarch aarch64 %define longarch aarch64 %endif +%ifarch %{arm} +%define longarch armv7 +%endif %ifarch x86_64 %define longarch x86_64 -%define os_release -centos65 -%endif -%ifarch aarch64 s390 s390x -%define xversion 7.8.4 -%else -%define xversion 7.8.3 %endif %ifarch s390 s390x %define sysname ibm %else +%ifarch x86_64 %{ix86} aarch64 %{arm} +%define sysname deb8 +%endif +%ifarch ppc64 ppc64le %define sysname unknown %endif - -%global without_hscolour 1 +%endif %global debug_package %{nil} Name: ghc-bootstrap -Version: 7.8.3 +Version: 8.2.1 Release: 0 Url: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap Summary: Binary distributions of The Glorious Glasgow Haskell Compiler License: BSD-3-Clause Group: Development/Languages/Other -Source: %{name}-%{version}.tar Source1: README.openSUSE Source2: LICENSE -Source10: ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2 -Source11: ghc-7.8.3-powerpc-unknown-linux.tar.bz2 -Source12: ghc-7.8.3-powerpc64-unknown-linux.tar.bz2 -Source13: ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2 -Source14: ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2 -Source15: ghc-7.8.4-s390-ibm-linux.tar.bz2 -Source16: ghc-7.8.4-s390x-ibm-linux.tar.bz2 -Source17: ghc-7.8.4-aarch64-unknown-linux.tar.bz2 +Source10: ghc-8.2.1-i386-deb8-linux.tar.xz +Source12: ghc-8.2.1-powerpc64-unknown-linux.tar.xz +Source13: ghc-8.2.1-powerpc64le-unknown-linux.tar.xz +Source14: ghc-8.2.1-x86_64-deb8-linux.tar.xz +Source16: ghc-8.2.1-s390x-ibm-linux.tar.xz +Source17: ghc-8.2.1-aarch64-deb8-linux.tar.xz +Source18: ghc-8.2.1-armv7-deb8-linux.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gmp-devel BuildRequires: libncurses5 -Requires: libncurses5 +%ifarch aarch64 %{arm} +BuildRequires: binutils-gold +Requires: binutils-gold +%endif Requires: gmp-devel +Requires: libncurses5 -ExclusiveArch: %{ix86} ppc ppc64 ppc64le x86_64 s390 s390x aarch64 +ExclusiveArch: %{ix86} ppc64 ppc64le x86_64 s390x aarch64 %{arm} Provides: ghc-bootstrap-devel Conflicts: ghc @@ -140,37 +141,24 @@ Haskell home page at . %prep -%setup -q cp %SOURCE1 . cp %SOURCE2 . cp %SOURCE10 . -cp %SOURCE11 . cp %SOURCE12 . cp %SOURCE13 . cp %SOURCE14 . -cp %SOURCE15 . cp %SOURCE16 . cp %SOURCE17 . +cp %SOURCE18 . %build -%if 0%{suse_version} > 1130 -ln -s %{_libdir}/libgmp.so.10 libgmp.so.3 -export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -%endif -tar jxf ghc-%{xversion}-%{longarch}-%{sysname}-linux%{?os_release}.tar.bz2 -cd ghc-%{xversion} +tar Jxf ghc-%{version}-%{longarch}-%{sysname}-linux.tar.xz +cd ghc-%{version} ./configure --prefix=%{_prefix} %install -%if 0%{suse_version} > 1130 -export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -%endif -cd ghc-%{xversion} +cd ghc-%{version} %makeinstall -%if 0%{suse_version} > 1130 -install -dm 0755 %{buildroot}%{_libdir} -ln -s %{_libdir}/libgmp.so.10 %{buildroot}%{_libdir}/libgmp.so.3 -%endif %fdupes -s %{buildroot} %post @@ -181,13 +169,10 @@ ghc-pkg recache %doc README.openSUSE %doc LICENSE %{_bindir}/* -%{_prefix}/lib/ghc-%{xversion} +%{_prefix}/lib/ghc-%{version} %{_datadir}/doc/* -%if 0%{suse_version} > 1130 -%{_libdir}/libgmp.so.3 -%endif -# for some reason there is no manpage for ghc in the x86_64 tarball -%ifarch %{ix86} + +%ifarch %{ix86} x86_64 aarch64 %{arm} %{_mandir}/man1/ghc.1* %endif