guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: r-haven: Fix build.


From: guix-commits
Subject: 02/03: gnu: r-haven: Fix build.
Date: Tue, 31 May 2022 09:24:34 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit 3d5144db5a8ee87fd75693d68c0ed0f84a7d4d20
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue May 31 15:15:34 2022 +0200

    gnu: r-haven: Fix build.
    
    * gnu/packages/cran.scm (r-haven)[arguments]: Adjust 'unbundle-readstat 
phase.
    
    Reported-by: Jonas Freimuth.
---
 gnu/packages/cran.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2bbb3f6a15..26e3e0e87a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3493,9 +3493,12 @@ including functions for geolocation and routing.")
        (modify-phases %standard-phases
          (add-after 'unpack 'unbundle-readstat
            (lambda _
-             ;; Not required, since we’re not building readstat.
-             (substitute* "src/Makevars"
-               (("-lz") "-lreadstat")))))))
+             ;; We’re not building readstat.
+             (substitute* "configure"
+               (("exit 1") "")) ;don't be so dramatic!
+             (substitute* '("src/Makevars.in"
+                            "configure")
+               (("^PKG_LIBS=.*") "PKG_LIBS=\"-lreadstat\"\n")))))))
     (inputs
      (list readstat))
     (native-inputs



reply via email to

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