mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-14 19:05:10 -05:00
gnu: libfive: Update to 0-5.b1ea998.
* gnu/packages/engineering.scm (libfive): Update to 0-5.b1ea998. [arguments]: Set HOME variable to fix autocompilation; set GUILE_CCACHE_DIR to override default target directory for compiled Guile files; add phases 'fix-library-location and 'install-scm-files.
This commit is contained in:
parent
0094b2b25f
commit
9b381235e0
1 changed files with 31 additions and 10 deletions
|
@ -891,8 +891,8 @@ (define-public translate2geda
|
||||||
(license license:gpl2+))))
|
(license license:gpl2+))))
|
||||||
|
|
||||||
(define-public libfive
|
(define-public libfive
|
||||||
(let ((commit "8ca1b8685ef3fac7b64e66b10459b8421a3020c6")
|
(let ((commit "b1ea998d8adb3884ab52798f7388f4354145f452")
|
||||||
(revision "4"))
|
(revision "5"))
|
||||||
(package
|
(package
|
||||||
(name "libfive")
|
(name "libfive")
|
||||||
(version (git-version "0" revision commit))
|
(version (git-version "0" revision commit))
|
||||||
|
@ -903,17 +903,38 @@ (define-public libfive
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1c762cd70iv2b9av0l9lq0py9138y98wk3dirhdmil7jncdhvq98"))
|
"0j91qq9d7949d2zs5wxyqd0ly644nb5690s8xnr6pchjl9z6pqxv"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:test-target "libfive-test"
|
(list
|
||||||
#:phases
|
#:test-target "libfive-test"
|
||||||
(modify-phases %standard-phases
|
#:configure-flags
|
||||||
(add-after 'unpack 'remove-native-compilation
|
#~(list (string-append "-DGUILE_CCACHE_DIR="
|
||||||
(lambda _
|
#$output "/lib/guile/3.0/site-ccache"))
|
||||||
(substitute* "CMakeLists.txt" (("-march=native") ""))
|
#:phases
|
||||||
#t)))))
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'fix-autocompilation
|
||||||
|
(lambda _ (setenv "HOME" "/tmp")))
|
||||||
|
(add-after 'unpack 'remove-native-compilation
|
||||||
|
(lambda _
|
||||||
|
(substitute* "CMakeLists.txt" (("-march=native") ""))))
|
||||||
|
(add-after 'unpack 'fix-library-location
|
||||||
|
(lambda _
|
||||||
|
(substitute* "libfive/bind/guile/libfive/lib.scm"
|
||||||
|
(("\\(get-environment-variable \"LIBFIVE_FRAMEWORK_DIR\"\\)" m)
|
||||||
|
(string-append m "\n\"" #$output "/lib/\""))
|
||||||
|
(("\\(get-environment-variable \"LIBFIVE_STDLIB_DIR\"\\)" m)
|
||||||
|
(string-append m "\n\"" #$output "/lib/\"")))))
|
||||||
|
(add-after 'install 'install-scm-files
|
||||||
|
(lambda _
|
||||||
|
(for-each
|
||||||
|
(lambda (file)
|
||||||
|
(install-file file
|
||||||
|
(string-append #$output
|
||||||
|
"/share/guile/site/3.0/libfive")))
|
||||||
|
(find-files "../source/libfive/bind/guile/libfive"
|
||||||
|
"\\.scm$")))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
Loading…
Reference in a new issue