[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/32: gnu: r-lpsymphony: Fix building on some architectures.
From: |
guix-commits |
Subject: |
24/32: gnu: r-lpsymphony: Fix building on some architectures. |
Date: |
Mon, 6 May 2024 19:19:43 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit a9c89cd11b7f8fee63fbb8b1180f46784af3cb81
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon May 6 19:00:14 2024 +0300
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(-)
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 <roel@gnu.org>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice
<me@tobias.gr>
;;; Copyright © 2019, 2020, 2021, 2022, 2023 Simon Tournier
<zimon.toutoune@gmail.com>
;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com>
@@ -34,6 +34,7 @@
#: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 @@ coordinates.")
(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
- 13/32: gnu: theorafile: Fix cross-compiling., (continued)
- 13/32: gnu: theorafile: Fix cross-compiling., guix-commits, 2024/05/06
- 12/32: gnu: theorafile: Use test-target., guix-commits, 2024/05/06
- 09/32: gnu: rednotebook: Correctly wrap the binary., guix-commits, 2024/05/06
- 07/32: gnu: libvisual-plugins: Build with librsvg-for-system., guix-commits, 2024/05/06
- 28/32: gnu: minimap2: Update to 2.28., guix-commits, 2024/05/06
- 30/32: gnu: grantlee: Fix build on some architectures., guix-commits, 2024/05/06
- 29/32: gnu: minimap2: Fix make-flags., guix-commits, 2024/05/06
- 03/32: gnu: varnish: Fix build on i686-linux., guix-commits, 2024/05/06
- 06/32: gnu: libvisual-plugins: Disable oinksie plugin., guix-commits, 2024/05/06
- 23/32: gnu: mouseloupe: Update the package style., guix-commits, 2024/05/06
- 24/32: gnu: r-lpsymphony: Fix building on some architectures.,
guix-commits <=
- 32/32: gnu: psascan: Limit to 64-bit systems., guix-commits, 2024/05/06
- 02/32: gnu: varnish-modules: Update to 0.22.0., guix-commits, 2024/05/06
- 10/32: gnu: elisa: Update to 23.08.5., guix-commits, 2024/05/06
- 22/32: gnu: mouseloupe: Don't hardcode building for i686., guix-commits, 2024/05/06
- 21/32: gnu: wolf-shaper: Add tunable property., guix-commits, 2024/05/06
- 20/32: gnu: wolf-shaper: Fix building on more architectures., guix-commits, 2024/05/06
- 11/32: gnu: theorafile: Update to 0.0.0-2.ea5fd6d., guix-commits, 2024/05/06
- 08/32: gnu: libvisual-plugins: Reformat with 'guix style'., guix-commits, 2024/05/06
- 26/32: gnu: proteinortho: Update to 6.3.2., guix-commits, 2024/05/06
- 14/32: gnu: gnome-js-common: Fix build on some architectures., guix-commits, 2024/05/06