From 3e04bbc620fda95a28d4a01262e61fcf62b6d341 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 00:12:56 +0100 Subject: [PATCH] update to 8.2.2: backport from fedora-haskell/ghc bootstrap build --- .gitignore | 1 + ghc-7.8.3-Cabal-install-PATH-warning.patch | 12 -- ghc-8.0.2-Cabal-dynlibdir.patch | 11 -- ghc-Cabal-install-PATH-warning.patch | 20 +++ ghc-Debian-osdecommitmemory-compat.patch | 39 ----- ghc.spec | 171 ++++++++++++--------- shadowed-deps.patch | 13 ++ sources | 3 +- 8 files changed, 136 insertions(+), 134 deletions(-) delete mode 100644 ghc-7.8.3-Cabal-install-PATH-warning.patch delete mode 100644 ghc-8.0.2-Cabal-dynlibdir.patch create mode 100644 ghc-Cabal-install-PATH-warning.patch delete mode 100644 ghc-Debian-osdecommitmemory-compat.patch create mode 100644 shadowed-deps.patch diff --git a/.gitignore b/.gitignore index bd8cf43..71eaaa4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ testsuite-6.12.3.tar.bz2 /ghc-8.0.2-testsuite.tar.xz /ghc-8.0.2-src.tar.xz /ghc-8.0.2/ +/ghc-8.2.2-src.tar.xz diff --git a/ghc-7.8.3-Cabal-install-PATH-warning.patch b/ghc-7.8.3-Cabal-install-PATH-warning.patch deleted file mode 100644 index e7ef6e1..0000000 --- a/ghc-7.8.3-Cabal-install-PATH-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ghc-7.8.3/libraries/Cabal/Cabal/Distribution/Simple/Install.hs~ 2014-07-10 13:34:21.000000000 +0900 -+++ ghc-7.8.3/libraries/Cabal/Cabal/Distribution/Simple/Install.hs 2014-08-29 16:48:12.621694879 +0900 -@@ -148,8 +148,7 @@ - notice verbosity ("Installing executable(s) in " ++ binPref) - inPath <- isInSearchPath binPref - when (not inPath) $ -- warn verbosity ("The directory " ++ binPref -- ++ " is not in the system search path.") -+ warn verbosity ("Executable installed in " ++ binPref) - - -- install include files for all compilers - they may be needed to compile - -- haskell files (using the CPP extension) diff --git a/ghc-8.0.2-Cabal-dynlibdir.patch b/ghc-8.0.2-Cabal-dynlibdir.patch deleted file mode 100644 index 3f55fa3..0000000 --- a/ghc-8.0.2-Cabal-dynlibdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ghc-8.0.1.20161117/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs~ 2016-11-18 07:08:46.000000000 +0900 -+++ ghc-8.0.1.20161117/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs 2016-12-07 18:19:02.670468156 +0900 -@@ -186,7 +186,7 @@ - JHC -> "$compiler" - LHC -> "$compiler" - UHC -> "$pkgid" -- _other -> "$abi", -+ _other -> "$compiler/$pkgkey", - libexecdir = case buildOS of - Windows -> "$prefix" "$libname" - _other -> "$prefix" "libexec", diff --git a/ghc-Cabal-install-PATH-warning.patch b/ghc-Cabal-install-PATH-warning.patch new file mode 100644 index 0000000..5081fa1 --- /dev/null +++ b/ghc-Cabal-install-PATH-warning.patch @@ -0,0 +1,20 @@ +--- ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs~ 2017-05-05 16:51:43.000000000 +0200 ++++ ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs 2018-01-23 23:05:47.047081056 +0100 +@@ -36,7 +36,7 @@ + import Distribution.Simple.Utils + ( createDirectoryIfMissingVerbose + , installDirectoryContents, installOrdinaryFile, isInSearchPath +- , die', info, noticeNoWrap, warn, matchDirFileGlob ) ++ , die', info, noticeNoWrap, warn, matchDirFileGlob, debug ) + import Distribution.Simple.Compiler + ( CompilerFlavor(..), compilerFlavor ) + import Distribution.Simple.Setup +@@ -215,7 +215,7 @@ + ++ " in " ++ binPref) + inPath <- isInSearchPath binPref + when (not inPath) $ +- warn verbosity ("The directory " ++ binPref ++ debug verbosity ("The directory " ++ binPref + ++ " is not in the system search path.") + case compilerFlavor (compiler lbi) of + GHC -> GHC.installExe verbosity lbi binPref buildPref progFix pkg_descr exe diff --git a/ghc-Debian-osdecommitmemory-compat.patch b/ghc-Debian-osdecommitmemory-compat.patch deleted file mode 100644 index 2c84d94..0000000 --- a/ghc-Debian-osdecommitmemory-compat.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: rts: Ensure we always give MADV_DONTNEED a chance in osDecommitMemory -Author: Ben Gamari -Origin: upstream, https://phabricator.haskell.org/D2780 -Bug: https://ghc.haskell.org/trac/ghc/ticket/12865 -Bug-Debian: https://bugs.debian.org/847677 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: ghc-8.0.2/rts/posix/OSMem.c -=================================================================== ---- ghc-8.0.2.orig/rts/posix/OSMem.c -+++ ghc-8.0.2/rts/posix/OSMem.c -@@ -522,11 +522,24 @@ - - #ifdef MADV_FREE - // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED -- // just swaps memory out -+ // just swaps memory out. Linux >= 4.5 has both DONTNEED and FREE; either -+ // will work as they both allow the system to free anonymous pages. -+ // It is important that we try both methods as the kernel which we were -+ // built on may differ from the kernel we are now running on. - r = madvise(at, size, MADV_FREE); --#else -- r = madvise(at, size, MADV_DONTNEED); -+ if(r < 0) { -+ if (errno == EINVAL) { -+ // Perhaps the system doesn't support MADV_FREE; fall-through and -+ // try MADV_DONTNEED. -+ } else { -+ sysErrorBelch("unable to decommit memory"); -+ } -+ } else { -+ return; -+ } - #endif -+ -+ r = madvise(at, size, MADV_DONTNEED); - if(r < 0) - sysErrorBelch("unable to decommit memory"); - } diff --git a/ghc.spec b/ghc.spec index be3e7e2..91e2c66 100644 --- a/ghc.spec +++ b/ghc.spec @@ -1,61 +1,67 @@ -# To bootstrap build a new version of ghc, uncomment the following: -#%%global ghc_bootstrapping 1 +# To bootstrap build a new version of ghc, comment out this line: +#%%global perf_build 1 -%if %{defined ghc_bootstrapping} -%global without_testsuite 1 -%global without_prof 1 +# to handle RCs +%global ghc_release 8.2.2 + +%if %{undefined perf_build} +%bcond_with testsuite +%bcond_with prof %{?ghc_bootstrap} ### uncomment to generate haddocks for bootstrap #%%undefine without_haddock +%else +%bcond_without testsuite +%bcond_without prof %endif Name: ghc # ghc must be rebuilt after a version bump to avoid ABI change problems -Version: 8.0.2 +Version: 8.2.2 # Since library subpackages are versioned: # - release can only be reset if *all* library versions get bumped simultaneously # (sometimes after a major release) # - minor release numbers for a branch should be incremented monotonically -# xhtml has not had a new release for some years -Release: 60%{?dist} +Release: 61%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport URL: https://haskell.org/ghc/ -Source0: https://downloads.haskell.org/~ghc/%{version}/ghc-%{version}-src.tar.xz -%if %{undefined without_testsuite} -Source1: https://downloads.haskell.org/~ghc/%{version}/ghc-%{version}-testsuite.tar.xz +Source0: https://downloads.haskell.org/~ghc/%{ghc_release}/ghc-%{version}-src.tar.xz +%if %{with testsuite} +Source1: https://downloads.haskell.org/~ghc/%{ghc_release}/ghc-%{version}-testsuite.tar.xz %endif Source3: ghc-doc-index.cron Source4: ghc-doc-index # absolute haddock path (was for html/libraries -> libraries) Patch1: ghc-gen_contents_index-haddock-path.patch -Patch2: ghc-7.8.3-Cabal-install-PATH-warning.patch -Patch3: ghc-8.0.2-Cabal-dynlibdir.patch +Patch2: ghc-Cabal-install-PATH-warning.patch +# https://github.com/haskell/cabal/issues/4728 +Patch4: https://gist.githubusercontent.com/expipiplus1/6720ebc3db90f36031d651ca2e6507c4/raw/b330b21457628dc7088236a000b4a0f16d109665/shadowed-deps.patch Patch12: ghc-armv7-VFPv3D16--NEON.patch # Debian patches: -Patch24: ghc-Debian-buildpath-abi-stability.patch +# doesn't apply to 8.2 +#Patch24: ghc-Debian-buildpath-abi-stability.patch Patch26: ghc-Debian-no-missing-haddock-file-warning.patch Patch27: ghc-Debian-reproducible-tmp-names.patch Patch28: ghc-Debian-x32-use-native-x86_64-insn.patch -Patch29: ghc-Debian-osdecommitmemory-compat.patch -# 8.0 needs llvm-3.7 -%global llvm_major 3.7 +# 8.2 needs llvm-3.9 +%global llvm_major 3.9 # fedora ghc has been bootstrapped on # %%{ix86} x86_64 ppc ppc64 armv7hl s390 s390x ppc64le aarch64 # and retired arches: alpha sparcv9 armv5tel # see also deprecated ghc_arches defined in /etc/rpm/macros.ghc-srpm by redhat-rpm-macros -%if %{undefined ghc_bootstrapping} +%if %{defined perf_build} BuildRequires: ghc-compiler = %{version} # for ABI hash checking BuildRequires: ghc = %{version} %endif -BuildRequires: ghc-rpm-macros-extra >= 1.6.15 +BuildRequires: ghc-rpm-macros-extra >= 1.8 BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -68,11 +74,11 @@ BuildRequires: libffi-devel BuildRequires: ncurses-devel # for man and docs BuildRequires: perl-interpreter -%if %{undefined without_testsuite} -BuildRequires: python2 +%if %{with testsuite} +BuildRequires: python3 %endif %if %{undefined without_manual} -BuildRequires: python2-sphinx +BuildRequires: python3-sphinx %endif %ifarch armv7hl aarch64 BuildRequires: llvm%{llvm_major} @@ -166,34 +172,35 @@ documention. # use "./libraries-versions.sh" to check versions %if %{defined ghclibdir} -%ghc_lib_subpackage -d -l BSD Cabal-1.24.2.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.1.1 -%ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-4.9.1.0 -%ghc_lib_subpackage -d -l BSD binary-0.8.3.0 -%ghc_lib_subpackage -d -l BSD bytestring-0.10.8.1 -%ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.5.7.1 -%ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.2.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport directory-1.3.0.0 -%ghc_lib_subpackage -d -l BSD filepath-1.4.1.1 +%ghc_lib_subpackage -d -l BSD Cabal-2.0.1.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.2.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-4.10.1.0 +%ghc_lib_subpackage -d -l BSD binary-0.8.5.1 +%ghc_lib_subpackage -d -l BSD bytestring-0.10.8.2 +%ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.5.10.2 +%ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.3.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport directory-1.3.0.2 +%ghc_lib_subpackage -d -l BSD filepath-1.4.1.2 %define ghc_pkg_obsoletes ghc-bin-package-db-devel < 0.0.0.0-12 # in ghc not ghc-libraries: %ghc_lib_subpackage -d -x ghc-%{ghc_version_override} %undefine ghc_pkg_obsoletes %ghc_lib_subpackage -d -x -l BSD ghc-boot-%{ghc_version_override} %ghc_lib_subpackage -d -l BSD ghc-boot-th-%{ghc_version_override} -%ghc_lib_subpackage -d -x -l BSD ghci-%{ghc_version_override} -%ghc_lib_subpackage -d -l BSD haskeline-0.7.3.0 -%ghc_lib_subpackage -d -l BSD hoopl-3.10.2.1 +%ghc_lib_subpackage -d -l BSD ghc-compact-0.1.0.0 +%ghc_lib_subpackage -d -l BSD -x ghci-%{ghc_version_override} +%ghc_lib_subpackage -d -l BSD haskeline-0.7.4.0 +%ghc_lib_subpackage -d -l BSD hoopl-3.10.2.2 %ghc_lib_subpackage -d -l BSD hpc-0.6.0.3 %ghc_lib_subpackage -d -l BSD pretty-1.1.3.3 -%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.4.3.0 -%ghc_lib_subpackage -d -l BSD template-haskell-2.11.1.0 -%ghc_lib_subpackage -d -l BSD -c ncurses-devel%{?_isa} terminfo-0.4.0.2 -%ghc_lib_subpackage -d -l BSD time-1.6.0.1 +%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.1.0 +%ghc_lib_subpackage -d -l BSD template-haskell-2.12.0.0 +%ghc_lib_subpackage -d -l BSD -c ncurses-devel%{?_isa} terminfo-0.4.1.0 +%ghc_lib_subpackage -d -l BSD time-1.8.0.2 %ghc_lib_subpackage -d -l BSD transformers-0.5.2.0 -%ghc_lib_subpackage -d -l BSD unix-2.7.2.1 +%ghc_lib_subpackage -d -l BSD unix-2.7.2.2 %if %{undefined without_haddock} -%ghc_lib_subpackage -d -l BSD xhtml-3000.2.1 +%ghc_lib_subpackage -d -l BSD xhtml-3000.2.2 %endif %endif @@ -217,12 +224,12 @@ except the ghc library, which is installed by the toplevel ghc metapackage. %prep -%setup -q -n %{name}-%{version} %{!?without_testsuite:-b1} +%setup -q -n %{name}-%{version} %{?with_testsuite:-b1} %patch1 -p1 -b .orig %patch2 -p1 -b .orig -%patch3 -p1 -b .orig +%patch4 -p1 -b .orig %if 0%{?fedora} || 0%{?rhel} > 6 rm -r libffi-tarballs @@ -232,11 +239,10 @@ rm -r libffi-tarballs %patch12 -p1 -b .orig %endif -%patch24 -p1 -b .orig +#%%patch24 -p1 -b .orig %patch26 -p1 -b .orig %patch27 -p1 -b .orig %patch28 -p1 -b .orig -%patch29 -p1 -b .orig %global gen_contents_index gen_contents_index.orig %if %{undefined without_haddock} @@ -251,7 +257,7 @@ fi # http://hackage.haskell.org/trac/ghc/wiki/Platforms # cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc cat > mk/build.mk << EOF -%if %{undefined ghc_bootstrapping} +%if %{defined perf_build} %ifarch armv7hl aarch64 BuildFlavour = perf-llvm %else @@ -264,7 +270,7 @@ BuildFlavour = quick-llvm BuildFlavour = quick %endif %endif -GhcLibWays = v dyn %{!?without_prof:p} +GhcLibWays = v dyn %{?with_prof:p} %if %{defined without_haddock} HADDOCK_DOCS = NO %endif @@ -286,29 +292,27 @@ EOF autoreconf %endif -# still happens when bootstrapping 8.0 with 7.10: -# x86_64: /usr/bin/ld: utils/ghc-pwd/dist-boot/Main.o: relocation R_X86_64_32S against `.text' can not be used when making a shared object; recompile with -fPIC -# aarch64: /usr/bin/ld: /usr/lib64/ghc-7.6.3/libHSrts.a(RtsFlags.o)(.text+0x578): unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `stdout@@GLIBC_2.17' -%ifarch x86_64 armv7hl aarch64 s390x ppc64 ppc64le -%global _hardened_ldflags %{nil} -%endif - -%ifnarch aarch64 ppc64 ppc64le -export CFLAGS="${CFLAGS:-%optflags}" +%if 0%{?fedora} > 28 +%ghc_set_cflags %else -%if %{undefined ghc_bootstrapping} -export CFLAGS="${CFLAGS:-%optflags}" +# -Wunused-label is extremely noisy +%ifarch aarch64 s390x +CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall -Werror=format-security //')}" +%else +CFLAGS="${CFLAGS:-%optflags}" %endif +export CFLAGS %endif export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}" +# for ghc-8.2 +export CC=%{_bindir}/gcc # * %%configure induces cross-build due to different target/host/build platform names -# * --with-gcc=%{_bindir}/gcc is to avoid ccache hardcoding problem when bootstrapping ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ - --with-gcc=%{_bindir}/gcc --docdir=%{_docdir}/ghc \ + --docdir=%{_docdir}/ghc \ --with-llc=%{_bindir}/llc-%{llvm_major} --with-opt=%{_bindir}/opt-%{llvm_major} \ %if 0%{?fedora} || 0%{?rhel} > 6 --with-system-libffi \ @@ -323,41 +327,59 @@ make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install +mv %{buildroot}%{ghclibdir}/*/libHS*ghc%{ghc_version}.so %{buildroot}%{_libdir}/ +for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do + chrpath -d $i +done + +for i in %{buildroot}%{ghclibdir}/package.conf.d/*.conf; do + sed -i -e 's!^dynamic-library-dirs: .*!dynamic-library-dirs: %{_libdir}!' $i +done + for i in %{ghc_packages_list}; do name=$(echo $i | sed -e "s/\(.*\)-.*/\1/") ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/") %ghc_gen_filelists $name $ver +%if 0%{?rhel} && 0%{?rhel} < 8 +echo "%%doc libraries/$name/LICENSE" >> ghc-$name.files +%else echo "%%license libraries/$name/LICENSE" >> ghc-$name.files +%endif done # ghc-base should own ghclibdir -echo "%%dir %{ghclibdir}" >> ghc-base.files +echo "%%dir %{ghclibdir}" >> ghc-base-devel.files %ghc_gen_filelists ghc-boot %{ghc_version_override} %ghc_gen_filelists ghc %{ghc_version_override} %ghc_gen_filelists ghci %{ghc_version_override} -%ghc_gen_filelists ghc-prim 0.5.0.0 -%ghc_gen_filelists integer-gmp 1.0.0.1 +%ghc_gen_filelists ghc-prim 0.5.1.1 +%ghc_gen_filelists integer-gmp 1.0.1.0 %define merge_filelist()\ cat ghc-%1.files >> ghc-%2.files\ cat ghc-%1-devel.files >> ghc-%2-devel.files\ cp -p libraries/%1/LICENSE libraries/LICENSE.%1\ -echo "%%license libraries/LICENSE.%1" >> ghc-%2.files +%if 0%{?rhel} && 0%{?rhel} < 8\ +echo "%%doc libraries/LICENSE.%1" >> ghc-%2.files\ +%else\ +echo "%%license libraries/LICENSE.%1" >> ghc-%2.files\ +%endif %merge_filelist integer-gmp base %merge_filelist ghc-prim base # add rts libs -echo "%%dir %{ghclibdir}/rts" >> ghc-base.files -ls %{buildroot}%{ghclibdir}/rts/libHS*.so >> ghc-base.files +echo "%{ghclibdir}/rts" >> ghc-base-devel.files +ls %{buildroot}%{_libdir}/libHSrts*.so >> ghc-base.files %if 0%{?rhel} && 0%{?rhel} < 7 ls %{buildroot}%{ghclibdir}/rts/libffi.so.* >> ghc-base.files %endif +sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_libdir}!' %{buildroot}%{ghclibdir}/package.conf.d/rts.conf sed -i -e "s|^%{buildroot}||g" ghc-base.files -ls -d %{buildroot}%{ghclibdir}/rts/lib*.a %{buildroot}%{ghclibdir}/package.conf.d/rts.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files +ls -d %{buildroot}%{ghclibdir}/package.conf.d/rts.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files %if 0%{?rhel} && 0%{?rhel} < 7 ls %{buildroot}%{ghclibdir}/rts/libffi.so >> ghc-base-devel.files %endif @@ -413,12 +435,12 @@ echo 'main = putStrLn "Foo"' > testghc/foo.hs $GHC testghc/foo.hs -o testghc/foo -dynamic [ "$(testghc/foo)" = "Foo" ] rm testghc/* -%if %{undefined without_testsuite} +%if %{with testsuite} make test %endif # check the ABI hashes -%if %{undefined ghc_bootstrapping} +%if %{defined perf_build} echo "Checking package ABI hashes:" for i in %{ghc_packages_list}; do old=$(ghc-pkg field $i id --simple-output || :) @@ -492,18 +514,20 @@ fi %{ghclibdir}/bin/hsc2hs %{ghclibdir}/bin/ghc-iserv %{ghclibdir}/bin/ghc-iserv-dyn -%if %{undefined without_prof} +%if %{with prof} %{ghclibdir}/bin/ghc-iserv-prof %endif %{ghclibdir}/bin/runghc -%ifnarch s390 s390x aarch64 %{mips} +%ifnarch s390 s390x %{mips} %{ghclibdir}/bin/ghc-split %endif +%{ghclibdir}/bin/hp2ps %{ghclibdir}/bin/unlit %{ghclibdir}/ghc-usage.txt %{ghclibdir}/ghci-usage.txt %dir %{ghclibdir}/package.conf.d %ghost %{ghclibdir}/package.conf.d/package.cache +%{ghclibdir}/package.conf.d/package.cache.lock %{ghclibdir}/platformConstants %{ghclibdir}/settings %{ghclibdir}/template-hsc.h @@ -548,6 +572,13 @@ fi %changelog +* Wed Jan 24 2018 Jens Petersen - 8.2.2-61 +- 8.2.2 bootstrap build +- install ghc libs in libdir and remove RUNPATHs +- add shadowed-deps.patch (haskell/cabal#4728) +- new ghc-compact library +- exclude ghc-boot for ghc-libraries + * Thu Oct 26 2017 Jens Petersen - 8.0.2-60 - fix space in BSDHaskellReport license macro for rpm-4.14 - mark other subpackages correctly as BSD license diff --git a/shadowed-deps.patch b/shadowed-deps.patch new file mode 100644 index 0000000..faa5db0 --- /dev/null +++ b/shadowed-deps.patch @@ -0,0 +1,13 @@ +diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs +index 949cc0f231..408794e078 100644 +--- a/compiler/main/Packages.hs ++++ b/compiler/main/Packages.hs +@@ -1339,7 +1339,7 @@ validateDatabase dflags pkg_map1 = + unusable = directly_ignored `Map.union` unusable_ignored + `Map.union` unusable_broken + `Map.union` unusable_cyclic +- `Map.union` unusable_shadowed ++ -- `Map.union` unusable_shadowed + + -- ----------------------------------------------------------------------------- + -- When all the command-line options are in, we can process our package diff --git a/sources b/sources index 219f0fc..9fd240d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ghc-8.0.2-src.tar.xz) = 58ea3853cd93b556ecdc4abd0be079b2621171b8491f59004ea4e036a4cba4470aaafe6591b942e0a50a64bdc47540e01fe6900212a1ef7087850112d9bfc5ef -SHA512 (ghc-8.0.2-testsuite.tar.xz) = 1b35fc6a5f482dc1e33f21ddf4c4fe17591990f16a4105c787225980a5f4dbaa42205204faf547f8e1b53f6356aefde9d3ff50cc416c9bf1a9ac08feadd74a99 +SHA512 (ghc-8.2.2-src.tar.xz) = 6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799