bug-guix
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#56322: [PATCH core-updates 1/3] gnu: ruby: trigger autotools bootstr


From: Remco van 't Veer
Subject: bug#56322: [PATCH core-updates 1/3] gnu: ruby: trigger autotools bootstrap
Date: Wed, 12 Oct 2022 15:35:27 +0200

* gnu/packages/ruby.scm (ruby-2.6, ruby-2.7): Remove autotools artifacts
---
 gnu/packages/ruby.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e1b71a0a1a..25d7aba933 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -116,7 +116,9 @@ (define-public ruby-2.6
        (snippet `(begin
                    ;; Remove bundled libffi
                    (delete-file-recursively "ext/fiddle/libffi-3.2.1")
-                   #t))))
+                   ;; Trigger bootstap
+                   (delete-file "configure")
+                   (delete-file "aclocal.m4")))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -142,6 +144,7 @@ (define-public ruby-2.6
      (list readline openssl-1.1 libffi gdbm))
     (propagated-inputs
      (list zlib))
+    (native-inputs (list autoconf automake))
     (native-search-paths
      (list (search-path-specification
             (variable "GEM_PATH")
@@ -185,10 +188,7 @@ (define-public ruby-2.7
                             "test/ruby/test_process.rb"
                             "test/ruby/test_system.rb"
                             "tool/rbinstall.rb")
-               (("/bin/sh") (which "sh")))
-             #t)))))
-    (native-inputs
-     (list autoconf))))
+               (("/bin/sh") (which "sh"))))))))))
 
 (define-public ruby-3.0
   (package
-- 
2.37.3






reply via email to

[Prev in Thread] Current Thread [Next in Thread]