branch master updated: gnu: r-cytolib: Unbundle boost.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 59706daf02 gnu: r-cytolib: Unbundle boost.
59706daf02 is described below

commit 59706daf02296a3814ffb3128d2ceb2a71de3950
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Jan 11 17:08:56 2024 +0100

    gnu: r-cytolib: Unbundle boost.
    
    * gnu/packages/bioconductor.scm (r-cytolib)[source]: Remove bundled copy of
    boost.
    [arguments]: Change build system to link with existing boost library.
    [inputs]: Add boost, openblas, protobuf, and zlib.
    
    Change-Id: I3d1b7d10c80ddaf8ed8eedfe9178ab212ef48e8d
---
 gnu/packages/bioconductor.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 69e6677062..d82a73ac51 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -59,6 +59,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
@@ -17756,9 +17757,31 @@ of the analyses while minimizing technical noise.")
        (uri (bioconductor-uri "cytolib" version))
        (sha256
         (base32
-         "1r2slhzrp3gf45k5gknqgj3vjz7p0rx2yjzrbp020inj82fp4mgi"))))
+         "1r2slhzrp3gf45k5gknqgj3vjz7p0rx2yjzrbp020inj82fp4mgi"))
+       ;; Remove bundled boost sources
+       (modules '((guix build utils)))
+       (snippet
+        '(delete-file-recursively "src/boost"))))
     (properties `((upstream-name . "cytolib")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'unbundle
+            (lambda _
+              (substitute* "src/Makevars.in"
+                (("\\$\\(USERLIB\\): \\$\\{boost_fs_objs\\}")
+                 "$(USERLIB):")
+                (("\\$\\{cytolib_objs\\} \\$\\{boost_fs_objs\\} 
\\$\\{boost_sys_objs\\}")
+                 "${cytolib_objs}")
+                (("PKG_CPPFLAGS =")
+                 "PKG_CPPFLAGS = -lboost_filesystem")
+                #;
+                (("^BOOSTFSLIB.*")
+                 (string-append "BOOSTFSLIB="
+                                #$(this-package-input "boost") 
"/libboost_filesystem.so\n"))))))))
+    (inputs (list boost openblas protobuf zlib))
     (native-inputs
      (list r-knitr))
     (propagated-inputs