diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-19 10:02:15 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-19 10:02:15 +0100 |
| commit | 1cc3b7e80f60a2a5a6a1400ed0b025efeae7a523 (patch) | |
| tree | 77cbf407563c8c4b1acc00fe0fdb8ac79b1fdd95 /gnu/packages/ruby.scm | |
| parent | f64ec2b15132c46bcdf0546196646237890832f6 (diff) | |
| parent | b7abea0fd6a146563830db1dc4ddd0cceb6fcf1c (diff) | |
Merge branch 'master' into gnome-team
Change-Id: I62da840b7600f2d3d8541e666d09e2f2a1b7d8c4
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index baae4b3aaf..7a54baba4d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -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 |