ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 13:09:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: commencement: Turn {gmp,mpfr,mpc}-boot into mere origins.

Browse source 
Reported by Thiago Jung Bauermann <bauermann@kolabnow.com>
at <https://issues.guix.gnu.org/49881>.

* gnu/packages/commencement.scm (gmp-boot, mpfr-boot, mpc-boot): Turn
into origins.
(gcc-core-mesboot1): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2021-08-13 00:01:30 +02:00
parent c4133c43c7
commit b417dde293
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gnu/packages/commencement.scm
View file

@ -1733,38 +1733,28 @@ (define (%boot-mesboot1-inputs)
"gawk" "grep" "guile" "make" "sed" "tar")))) "gawk" "grep" "guile" "make" "sed" "tar"))))
(define gmp-boot (define gmp-boot
(package (let ((version "4.3.2"))
(inherit gmp) (origin
(version "4.3.2") (method url-fetch)
(source (origin (uri (string-append "mirror://gnu/gmp/gmp-" version ".tar.gz"))
(method url-fetch) (sha256
(uri (string-append "mirror://gnu/gmp/gmp-" version (base32 "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv")))))
".tar.gz"))
(sha256 (base32
"15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv"))))))
(define mpfr-boot (define mpfr-boot
(package (let ((version "2.4.2"))
(inherit mpfr) (origin
(version "2.4.2") (method url-fetch)
(source (origin (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.gz"))
(method url-fetch) (sha256
(uri (string-append "mirror://gnu/mpfr/mpfr-" version (base32 "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94")))))
".tar.gz"))
(sha256 (base32
"0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94"))))))
(define mpc-boot (define mpc-boot
(package (let ((version "1.0.3"))
(inherit mpc) (origin
(version "1.0.3") (method url-fetch)
(source (origin (uri (string-append "mirror://gnu/mpc/mpc-" version ".tar.gz"))
(method url-fetch) (sha256
(uri (string-append (base32 "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1")))))
"mirror://gnu/mpc/mpc-" version ".tar.gz"))
(sha256
(base32
"1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"))))))
(define gcc-core-mesboot1 (define gcc-core-mesboot1
;; GCC 4.6.4 is the latest modular distribution. This package is not ;; GCC 4.6.4 is the latest modular distribution. This package is not
@ -1782,9 +1772,9 @@ (define gcc-core-mesboot1
(sha256 (sha256
(base32 (base32
"173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75")))) "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75"))))
(inputs `(("gmp-source" ,(package-source gmp-boot)) (inputs `(("gmp-source" ,gmp-boot)
("mpfr-source" ,(package-source mpfr-boot)) ("mpfr-source" ,mpfr-boot)
("mpc-source" ,(package-source mpc-boot)))) ("mpc-source" ,mpc-boot)))
(native-inputs (%boot-mesboot1-inputs)) (native-inputs (%boot-mesboot1-inputs))
(arguments (arguments
(list #:implicit-inputs? #f (list #:implicit-inputs? #f
@ -1857,14 +1847,17 @@ (define gcc-core-mesboot1
(list gmp mpfr mpc)) (list gmp mpfr mpc))
;; Create symlinks like `gmp' -> `gmp-x.y.z'. ;; Create symlinks like `gmp' -> `gmp-x.y.z'.
#$@(map (lambda (lib) #$@(map (lambda (lib package)
;; Drop trailing letters, as gmp-6.0.0a unpacks ;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0. ;; into gmp-6.0.0.
#~(symlink #$(string-trim-right #~(symlink #$(string-trim-right
(package-full-name lib "-") (basename
(origin-actual-file-name lib)
".tar.gz")
char-set:letter) char-set:letter)
#$(package-name lib))) #$package))
(list gmp-boot mpfr-boot mpc-boot))))) (list gmp-boot mpfr-boot mpc-boot)
'("gmp" "mpfr" "mpc")))))
(add-before 'configure 'setenv (add-before 'configure 'setenv
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))