From a9c89cd11b7f8fee63fbb8b1180f46784af3cb81 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 May 2024 19:00:14 +0300 Subject: gnu: r-lpsymphony: Fix building on some architectures. * gnu/packages/bioconductor.scm (r-lpsymphony) [arguments]: When building for aarch64-linux or riscv64-linux replace all the config.guess and config.sub files with newer ones. [native-inputs]: When building for aarch64-linux or riscv64-linux add config. Change-Id: Iaddda8c6d7330fb02bdd83733e7fa70b851a82f2 --- gnu/packages/bioconductor.scm | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a8d9b91d2..94649d8a45 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2017, 2022 Efraim Flashner +;;; Copyright © 2017, 2022, 2024 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Simon Tournier ;;; Copyright © 2020 Peter Lo @@ -34,6 +34,7 @@ (define-module (gnu packages bioconductor) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system r) #:use-module (gnu packages) @@ -14320,17 +14321,37 @@ (define-public r-lpsymphony (arguments (list #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'make-build-order-reproducible - (lambda _ - (substitute* '("src/SYMPHONY/Cgl/configure.ac" - "src/SYMPHONY/Cgl/configure") - (("for file in `ls \\*/Makefile.in`") - "for file in `ls */Makefile.in | sort`"))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'make-build-order-reproducible + (lambda _ + (substitute* '("src/SYMPHONY/Cgl/configure.ac" + "src/SYMPHONY/Cgl/configure") + (("for file in `ls \\*/Makefile.in`") + "for file in `ls */Makefile.in | sort`")))) + #$@(if (or (target-aarch64?) + (target-riscv64?)) + #~((add-after 'unpack 'update-config-files + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each + (lambda (location) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) + (dirname location))) + '("config.guess" "config.sub"))) + (find-files "." "config\\.guess"))))) + #~())))) (inputs (list zlib)) (native-inputs - (list pkg-config r-knitr)) + (append + (list pkg-config r-knitr) + (if (or (target-aarch64?) + (target-riscv64?)) + (list config) + '()))) (home-page "https://r-forge.r-project.org/projects/rsymphony") (synopsis "Symphony integer linear programming solver in R") (description -- cgit v1.2.3