highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-28 09:51:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: Reindent existing manifest.scm

Browse Source
This commit is contained in:
Carl Dong 2021-02-04 18:58:26 -05:00
parent c090a3e923
commit 0a2176d477
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
contrib/guix/manifest.scm
View File

@ -52,28 +52,28 @@ we link against libssp.so, and thus will ensure that this works properly.
Taken from: Taken from:
http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html" http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
(package (package
(inherit xgcc) (inherit xgcc)
(arguments (arguments
(substitute-keyword-arguments (package-arguments xgcc) (substitute-keyword-arguments (package-arguments xgcc)
((#:make-flags flags) ((#:make-flags flags)
`(cons "gcc_cv_libc_provides_ssp=yes" ,flags)))))) `(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
(define (make-gcc-rpath-link xgcc) (define (make-gcc-rpath-link xgcc)
"Given a XGCC package, return a modified package that replace each instance of "Given a XGCC package, return a modified package that replace each instance of
-rpath in the default system spec that's inserted by Guix with -rpath-link" -rpath in the default system spec that's inserted by Guix with -rpath-link"
(package (package
(inherit xgcc) (inherit xgcc)
(arguments (arguments
(substitute-keyword-arguments (package-arguments xgcc) (substitute-keyword-arguments (package-arguments xgcc)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'pre-configure 'replace-rpath-with-rpath-link (add-after 'pre-configure 'replace-rpath-with-rpath-link
(lambda _ (lambda _
(substitute* (cons "gcc/config/rs6000/sysv4.h" (substitute* (cons "gcc/config/rs6000/sysv4.h"
(find-files "gcc/config" (find-files "gcc/config"
"^gnu-user.*\\.h$")) "^gnu-user.*\\.h$"))
(("-rpath=") "-rpath-link=")) (("-rpath=") "-rpath-link="))
#t)))))))) #t))))))))
(define (make-cross-toolchain target (define (make-cross-toolchain target
base-gcc-for-libc base-gcc-for-libc
@ -127,18 +127,18 @@ chain for " target " development."))
(license (package-license xgcc))))) (license (package-license xgcc)))))
(define* (make-bitcoin-cross-toolchain target (define* (make-bitcoin-cross-toolchain target
#:key #:key
(base-gcc-for-libc gcc-7) (base-gcc-for-libc gcc-7)
(base-kernel-headers linux-libre-headers-5.4) (base-kernel-headers linux-libre-headers-5.4)
(base-libc glibc) ; glibc 2.31 (base-libc glibc) ; glibc 2.31
(base-gcc (make-gcc-rpath-link gcc-8))) (base-gcc (make-gcc-rpath-link gcc-8)))
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
desirable for building Bitcoin Core release binaries." desirable for building Bitcoin Core release binaries."
(make-cross-toolchain target (make-cross-toolchain target
base-gcc-for-libc base-gcc-for-libc
base-kernel-headers base-kernel-headers
base-libc base-libc
base-gcc)) base-gcc))
(define (make-gcc-with-pthreads gcc) (define (make-gcc-with-pthreads gcc)
(package-with-extra-configure-variable gcc "--enable-threads" "posix")) (package-with-extra-configure-variable gcc "--enable-threads" "posix"))
@ -177,22 +177,22 @@ chain for " target " development."))
(define-public font-tuffy (define-public font-tuffy
(package (package
(name "font-tuffy") (name "font-tuffy")
(version "20120614") (version "20120614")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz")) (uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6")))) "02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "http://tulrich.com/fonts/") (home-page "http://tulrich.com/fonts/")
(synopsis "The Tuffy Truetype Font Family") (synopsis "The Tuffy Truetype Font Family")
(description (description
"Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ") "Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
(license license:public-domain))) (license license:public-domain)))
(define-public lief (define-public lief
(package (package