mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-07 11:29:59 +01:00
gnu: julia: Avoid old-style input and output alists.
* gnu/packages/julia.scm (julia)[arguments]: Remove references to ‘%outputs’ and ‘%build-inputs’ in #:make-flags. Change-Id: I400c038437a1f9f8bc010d22aa874c892958cfe2
This commit is contained in:
parent
1c9984fc2a
commit
c5fd5e7dfe
1 changed files with 5 additions and 6 deletions
|
@ -549,8 +549,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
|
||||||
("" "$JULIA_DEPOT_PATH"))))))))
|
("" "$JULIA_DEPOT_PATH"))))))))
|
||||||
|
|
||||||
#:make-flags
|
#:make-flags
|
||||||
#~(list (string-append "prefix="
|
#~(list (string-append "prefix=" #$output)
|
||||||
(assoc-ref %outputs "out"))
|
|
||||||
|
|
||||||
;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build
|
;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build
|
||||||
;; binary substitutes for the supported architectures. See also
|
;; binary substitutes for the supported architectures. See also
|
||||||
|
@ -571,8 +570,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
|
||||||
(_ "JULIA_CPU_TARGET=generic"))
|
(_ "JULIA_CPU_TARGET=generic"))
|
||||||
|
|
||||||
"CONFIG_SHELL=bash -x" ;needed to build bundled libraries
|
"CONFIG_SHELL=bash -x" ;needed to build bundled libraries
|
||||||
(string-append "CC="
|
(string-append "CC=" #$(cc-for-target))
|
||||||
#$(cc-for-target))
|
|
||||||
|
|
||||||
#$@(if (target-x86-64?)
|
#$@(if (target-x86-64?)
|
||||||
`("USE_BLAS64=1"
|
`("USE_BLAS64=1"
|
||||||
|
@ -582,8 +580,9 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
|
||||||
"LIBBLASNAME=libopenblas"))
|
"LIBBLASNAME=libopenblas"))
|
||||||
|
|
||||||
(string-append "UTF8PROC_INC="
|
(string-append "UTF8PROC_INC="
|
||||||
(assoc-ref %build-inputs "utf8proc")
|
(dirname
|
||||||
"/include")
|
(search-input-file %build-inputs
|
||||||
|
"/include/utf8proc.h")))
|
||||||
;; Make.inc expects a static library for libuv.
|
;; Make.inc expects a static library for libuv.
|
||||||
(string-append "LIBUV="
|
(string-append "LIBUV="
|
||||||
(search-input-file %build-inputs
|
(search-input-file %build-inputs
|
||||||
|
|
Loading…
Add table
Reference in a new issue