[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/13: gnu: ruby-libffi: Enable tests and unbundle LibFFI.
From: |
guix-commits |
Subject: |
07/13: gnu: ruby-libffi: Enable tests and unbundle LibFFI. |
Date: |
Fri, 29 May 2020 09:42:27 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 075afce25eb1de1710bd3f93bd42b49343af4222
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu May 28 18:51:32 2020 +0200
gnu: ruby-libffi: Enable tests and unbundle LibFFI.
* gnu/packages/libffi.scm (ruby-ffi)[source]: Change to GIT-FETCH.
[arguments]: Remove #:tests?. Add #:phases.
---
gnu/packages/libffi.scm | 58 +++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 51 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 329eabd..da0c9dc 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -28,6 +28,7 @@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (gnu packages check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@@ -184,15 +185,58 @@ project.")
(name "ruby-ffi")
(version "1.12.2")
(source (origin
- (method url-fetch)
- (uri (rubygems-uri "ffi" version))
+ ;; Pull from git because the RubyGems release bundles LibFFI,
+ ;; and comes with a gemspec that makes it difficult to unbundle.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ffi/ffi")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"))))
+ "1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd"))))
(build-system ruby-build-system)
- ;; FIXME: Before running tests the build system attempts to build libffi
- ;; from sources.
- (arguments `(#:tests? #f))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'do-not-depend-on-ccache
+ (lambda _
+ (substitute* "spec/ffi/fixtures/GNUmakefile"
+ (("^CCACHE := .*")
+ ""))
+ #t))
+ (replace 'replace-git-ls-files
+ (lambda _
+ ;; Do not try to execute git, or include the (un)bundled LibFFI.
+ (substitute* "ffi.gemspec"
+ (("git ls-files -z")
+ "find * -type f -print0 | sort -z")
+ (("lfs \\+?= .*")
+ "lfs = []\n"))
+ (substitute* "Rakefile"
+ (("LIBFFI_GIT_FILES = .*")
+ "LIBFFI_GIT_FILES = []\n"))
+ #t))
+ (replace 'build
+ (lambda _
+ ;; Tests depend on the native extensions, so we build it
+ ;; beforehand without going through the gem machinery.
+ (invoke "rake" "compile")
+
+ ;; XXX: Ideally we'd use "rake native gem" here to prevent the
+ ;; install phase from needlessly rebuilding everything, but that
+ ;; requires the bundled LibFFI, and the install phase can not
+ ;; deal with such gems anyway.
+ (invoke "gem" "build" "ffi.gemspec")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ (setenv "MAKE" "make")
+ (setenv "CC" "gcc")
+ (invoke "rspec" "spec"))
+ (format #t "test suite not run~%"))
+ #t)))))
(native-inputs
`(("ruby-rake-compiler" ,ruby-rake-compiler)
("ruby-rspec" ,ruby-rspec)
- branch master updated (ebfe0e6 -> 1ca44ae), guix-commits, 2020/05/29
- 01/13: gnu: love: Remove unused input., guix-commits, 2020/05/29
- 02/13: gnu: physfs: Do not build the static library., guix-commits, 2020/05/29
- 04/13: gnu: ruby-ffi: Update to 1.12.2., guix-commits, 2020/05/29
- 03/13: gnu: ruby-spec-its: Accept any version of ruby-ffi., guix-commits, 2020/05/29
- 07/13: gnu: ruby-libffi: Enable tests and unbundle LibFFI.,
guix-commits <=
- 06/13: gnu: ruby-rubygems-tasks: Update to 0.2.5., guix-commits, 2020/05/29
- 08/13: gnu: ruby-crass: Update to 1.0.6., guix-commits, 2020/05/29
- 09/13: gnu: ruby-nokogiri: Update to 1.10.9., guix-commits, 2020/05/29
- 10/13: gnu: ruby-nokogumbo: Update to 2.0.2., guix-commits, 2020/05/29
- 11/13: gnu: ruby-sanitize: Update to 5.1.0., guix-commits, 2020/05/29
- 12/13: utils: Add 'cc-for-target'., guix-commits, 2020/05/29
- 05/13: gnu: ruby-rake-compiler: Update to 1.1.0., guix-commits, 2020/05/29
- 13/13: gnu: Use 'cc-for-target' instead of custom implementations., guix-commits, 2020/05/29