[Git][ghc/ghc][ghc-9.4] 2 commits: linters-common: Add LICENSE

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch ghc-9.4 at Glasgow Haskell Compiler / GHC


Commits:
4f70fbff by Ben Gamari at 2022-08-17T16:39:43+00:00
linters-common: Add LICENSE

- - - - -
d04c592d by Ben Gamari at 2022-08-17T17:50:22+00:00
make: Fix bindist installation

- - - - -


2 changed files:

- ghc.mk
- + linters/linters-common/LICENSE


Changes:

=====================================
ghc.mk
=====================================
@@ -135,10 +135,13 @@ include mk/config.mk
 ifeq "$(ProjectVersion)" ""
 $(error Please run ./configure first)
 endif
+
+ifneq "$(BINDIST)" "YES"
 ifneq "$(CanBootWithMake)" "YES"
 $(error The make build system requires a boot compiler older than ghc-9.2. Your boot compiler is too new and cannot be used to build ghc-9.4 with make. Either boot with ghc 9.0.2 or build with hadrian. See https://www.haskell.org/ghc/blog/20220805-make-to-hadrian.html for advice on transitioning to hadrian.)
 endif
 endif
+endif
 
 include mk/ways.mk
 
@@ -493,6 +496,8 @@ libraries/ghc-bignum_CONFIGURE_OPTS += -f $(BIGNUM_BACKEND)
 CABAL_DEPS = text transformers mtl parsec Cabal/Cabal-syntax
 CABAL_BOOT_DEPS = process array filepath base bytestring containers deepseq time unix pretty directory
 
+# N.B. This shouldn't be needed while installing a binary distribution.
+ifneq "$(BINDIST)" "YES"
 BOOT_PKG_DEPS := \
     $(foreach p,$(CABAL_BOOT_DEPS),\
         --dependency="$p=$p-$(shell $(GHC_PKG) --simple-output field $p version)")
@@ -501,6 +506,7 @@ STAGE0_PKG_DEPS := \
     $(foreach d,$(CABAL_DEPS),\
         $(foreach p,$(basename $(notdir $(wildcard libraries/$d/*.cabal))),\
             --dependency="$p=$p-$(shell grep -i "^Version:" libraries/$d/$p.cabal | sed "s/[^0-9.]//g")"))
+endif
 
 libraries/Cabal/Cabal_dist-boot_CONFIGURE_OPTS += --exact-configuration $(BOOT_PKG_DEPS) $(STAGE0_PKG_DEPS)
 


=====================================
linters/linters-common/LICENSE
=====================================
@@ -0,0 +1,31 @@
+The Glasgow Haskell Compiler License
+
+Copyright 2002, The University Court of the University of Glasgow. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0bea62ff81bd05ed4c88b6c96a1d77f857936114...d04c592df1643b1f3bdf1824a9c88887c054402e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0bea62ff81bd05ed4c88b6c96a1d77f857936114...d04c592df1643b1f3bdf1824a9c88887c054402e
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220818/c3eae2e5/attachment-0001.html>