me
/
guix
Archived
1
0
Fork 0
Code

gnu: ghc@4: Replace config.sub using config package. 

* gnu/packages/haskell.scm (ghc@4)[arguments]: Adjust custom 'bootstrap
phase to adjust replacement of config.sub.
[native-inputs]: Remove automake, add config.
Efraim Flashner 2022-02-15 11:09:52 +02:00
parent 3f929203cf
commit 04ac1a248c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/haskell.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@ -205,8 +205,8 @@ is itself quite fast.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(delete-file "configure") (delete-file "configure")
(delete-file "config.sub") (delete-file "config.sub")
(install-file (string-append (assoc-ref inputs "automake") (install-file (search-input-file inputs
"/share/automake-1.16/config.sub") "/bin/config.sub")
".") ".")
;; Avoid dependency on "happy" ;; Avoid dependency on "happy"
@ -347,8 +347,8 @@ SplitObjs=NO
(install-file "ghc/interpreter/nHandle.so" lib))))))) (install-file "ghc/interpreter/nHandle.so" lib)))))))
(native-inputs (native-inputs
(list autoconf-2.13 (list autoconf-2.13
automake
bison ;for parser.y bison ;for parser.y
config
;; Needed to support lvalue casts. ;; Needed to support lvalue casts.
gcc-2.95 gcc-2.95