From d40b5684c533e0188ffa213b20f2d3c88406d895 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Feb 2018 14:14:13 +0100 Subject: gnu: julia: Adjust libgit2 tests. * gnu/packages/julia.scm (julia)[arguments] <'disable-broken-tests>: Patch libgit2.jl. --- gnu/packages/julia.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/julia.scm') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index f6df2817d3..d958995288 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -228,6 +228,12 @@ #t)) (add-before 'check 'disable-broken-tests (lambda _ + ;; Adjust expected error messages to match what current libgit2 + ;; provides. + (substitute* "test/libgit2.jl" + (("Invalid Content-Type") "invalid Content-Type") + (("Failed to resolve path") "failed to resolve path")) + (substitute* "test/choosetests.jl" ;; These tests fail, probably because some of the input ;; binaries have been stripped and thus backtraces don't look -- cgit v1.2.3 From 9805ad6f87612b5c305c099c38684607cecfb328 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Feb 2018 14:21:12 +0100 Subject: gnu: julia: Don't invoke /sbin/ldconfig. Reported by Marco van Hulten in . * gnu/packages/julia.scm (julia)[arguments] <'hardcode-soname-map>: Patch out 'ldconfig' invocations. --- gnu/packages/julia.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/julia.scm') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index d958995288..41bbc66dd2 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -146,6 +146,12 @@ (lambda* (#:key inputs #:allow-other-keys) (use-modules (ice-9 match)) (substitute* "src/runtime_ccall.cpp" + ;; Patch out invocations of '/sbin/ldconfig' to avoid getting + ;; error messages about missing '/sbin/ldconfig' on GuixSD. + (("popen\\(.*ldconfig.*\\);") + "NULL;\n") + + ;; Populate 'sonameMap'. (("jl_read_sonames.*;") (string-join (map (match-lambda -- cgit v1.2.3