;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2020, 2021 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>
+;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020 John Doe <dftxbs3e@free.fr>
;;;
;;; This file is part of GNU Guix.
;;;
#: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)
name "-" version ".tar.gz"))
(sha256
(base32
- "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"))))
+ "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"))
+ (patches (search-patches "libffi-3.3-powerpc-fixes.patch"
+ "libffi-float128-powerpc64le.patch"))))
(build-system gnu-build-system)
(arguments
`(;; Prevent the build system from passing -march and -mtune to the
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
- #:configure-flags '("--enable-portable-binary" "--without-gcc-arch")))
+ #:configure-flags '("--enable-portable-binary"
+ "--without-gcc-arch")))
(outputs '("out" "debug"))
(synopsis "Foreign function call interface library")
(description
provides the lowest, machine dependent layer of a fully featured foreign
function interface. A layer must exist above libffi that handles type
conversions for values passed between the two languages.")
- (home-page "http://sources.redhat.com/libffi/")
+ (home-page "http://www.sourceware.org/libffi/")
+ (properties `((release-monitoring-url . ,home-page)))
;; See <https://github.com/atgreen/libffi/blob/master/LICENSE>.
(license expat)))
(define-public python-cffi
(package
(name "python-cffi")
- (version "1.14.0")
+ (version "1.14.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cffi" version))
(sha256
- (base32 "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d"))))
+ (base32 "0v080s7vlrjz9z823x2yh36yc8drwpvvir6w8wfkkzd7k2z5qihs"))))
(build-system python-build-system)
(inputs
`(("libffi" ,libffi)))
`(("pkg-config" ,pkg-config)
("python-pytest" ,python-pytest)))
(arguments
- `(#:modules ((ice-9 ftw)
- (srfi srfi-26)
- (guix build utils)
- (guix build python-build-system))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
- (setenv "PYTHONPATH"
- (string-append
- (getenv "PYTHONPATH")
- ":" (getcwd) "/build/"
- (car (scandir "build" (cut string-prefix? "lib." <>)))))
-
;; XXX The "normal" approach of setting CC and friends does
;; not work here. Is this the correct way of doing things?
(substitute* "testing/embedding/test_basic.py"
"linker_so='gcc -shared')")))
(substitute* "testing/cffi0/test_ownlib.py"
(("\"cc testownlib") "\"gcc testownlib"))
- (invoke "py.test" "-v" "c/" "testing/")
- #t))
+ (invoke "py.test" "-v" "c/" "testing/")))
(add-before 'check 'patch-paths-of-dynamically-loaded-libraries
(lambda* (#:key inputs #:allow-other-keys)
;; Shared libraries should be referred by their absolute path as
(format #f "lib_m = ['~a']" libm)))
(substitute* "c/test_c.py"
(("find_and_load_library\\(['\"]{1}c['\"]{1}")
- (format #f "find_and_load_library('~a'" libc)))
- #t))))))
+ (format #f "find_and_load_library('~a'" libc)))))))))
(home-page "https://cffi.readthedocs.io/")
(synopsis "Foreign function interface for Python")
(description "Foreign Function Interface for Python calling C code.")
(define-public ruby-ffi
(package
(name "ruby-ffi")
- (version "1.10.0")
+ (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
- "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"))))
+ "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)
dynamic libraries, binding functions within them, and calling those functions
from Ruby code. Moreover, a Ruby-FFI extension works without changes on Ruby
and JRuby.")
- (home-page "http://wiki.github.com/ffi/ffi")
+ (home-page "https://wiki.github.com/ffi/ffi")
(license bsd-3)))