me
/
guix
Archived
1
0
Fork 0
Code

gnu: sunxi-tools: Improve build error reporting. 

* gnu/packages/admin.scm (sunxi-tools)[arguments]<#:phases>[set-environment-up]:
Improve build error reporting.
master
Danny Milosavljevic 2018-03-08 00:39:58 +01:00
parent f43857d65d
commit e7988175d9
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/admin.scm
View File

@ -2080,25 +2080,34 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(define (cross? x) (define (cross? x)
(string-contains x "cross-arm-linux")) (string-contains x "cross-arm-linux"))
(define (filter-environment! filter-predicate
environment-variable-names)
(for-each
(lambda (env-name)
(let* ((env-value (getenv env-name))
(search-path (search-path-as-string->list env-value))
(new-search-path (filter filter-predicate
search-path))
(new-env-value (list->search-path-as-string
new-search-path ":")))
(setenv env-name new-env-value)))
environment-variable-names))
(setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
(setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(for-each (filter-environment! cross?
(lambda (env-name) '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"
(let* ((env-value (getenv env-name)) "CROSS_LIBRARY_PATH"))
(search-path (search-path-as-string->list env-value)) (filter-environment! (lambda (e) (not (cross? e)))
(new-search-path (filter (lambda (e) (not (cross? e))) '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
search-path)) "LIBRARY_PATH"))
(new-env-value (list->search-path-as-string
new-search-path ":")))
(setenv env-name new-env-value)))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH"))
#t)) #t))
(replace 'build (replace 'build
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(zero? (apply system* "make" "tools" "misc" make-flags)))) (zero? (apply system* "make" "tools" "misc" make-flags))))
(add-after 'build 'build-armhf (add-after 'build 'build-armhf
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(setenv "LIBRARY_PATH" #f)
(zero? (apply system* "make" "target-tools" make-flags)))) (zero? (apply system* "make" "target-tools" make-flags))))
(replace 'install (replace 'install
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)