mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into gnome-team
Change-Id: I62da840b7600f2d3d8541e666d09e2f2a1b7d8c4
This commit is contained in:
commit
1cc3b7e80f
109 changed files with 50376 additions and 1734 deletions
|
@ -34,6 +34,7 @@
|
|||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -130,7 +131,13 @@
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:configure-flags '("--enable-shared") ; dynamic linking
|
||||
#:configure-flags
|
||||
,(if (%current-target-system)
|
||||
'(list (string-append
|
||||
"LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
"--enable-shared")
|
||||
''("--enable-shared")) ; dynamic linking
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'replace-bin-sh-and-remove-libffi
|
||||
|
@ -148,6 +155,9 @@
|
|||
"tool/rbinstall.rb")
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t)))))
|
||||
(native-inputs (if (%current-target-system)
|
||||
(list this-package)
|
||||
'()))
|
||||
(inputs
|
||||
(list readline openssl-1.1 libffi gdbm))
|
||||
(propagated-inputs
|
||||
|
@ -178,7 +188,13 @@ a focus on simplicity and productivity.")
|
|||
"042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"))))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:configure-flags '("--enable-shared") ; dynamic linking
|
||||
#:configure-flags
|
||||
,(if (%current-target-system)
|
||||
'(list (string-append
|
||||
"LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
"--enable-shared")
|
||||
''("--enable-shared")) ; dynamic linking
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'replace-bin-sh-and-remove-libffi
|
||||
|
@ -205,7 +221,10 @@ a focus on simplicity and productivity.")
|
|||
(delete-file "test/ruby/test_io.rb"))))
|
||||
'()))))
|
||||
(native-inputs
|
||||
(list autoconf))))
|
||||
(append (if (%current-target-system)
|
||||
(list this-package)
|
||||
'())
|
||||
(list autoconf)))))
|
||||
|
||||
(define ruby-2.7-fixed
|
||||
(package
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue