[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: patch: Work around a cross-compilation issue.
|
From: |
Ludovic Courtès |
|
Subject: |
01/03: gnu: patch: Work around a cross-compilation issue. |
|
Date: |
Sun, 22 Apr 2018 16:41:21 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit d3878d3d5152af371e572cd38f08414b3ba82abc
Author: Ludovic Courtès <address@hidden>
Date: Sun Apr 22 22:16:36 2018 +0200
gnu: patch: Work around a cross-compilation issue.
Reported by Marius Bakke <address@hidden>
at <https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00157.html>.
* gnu/packages/base.scm (patch)[arguments]: New field.
---
gnu/packages/base.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1be63c3..a163018 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -231,6 +231,12 @@ standard utility.")
"1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
(patches (search-patches "patch-hurd-path-max.patch"))))
(build-system gnu-build-system)
+ (arguments
+ ;; Work around a cross-compilation bug whereby libpatch.a would provide
+ ;; '__mktime_internal', which conflicts with the one in libc.a.
+ (if (%current-target-system)
+ `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
+ '()))
(native-inputs `(("ed" ,ed)))
(synopsis "Apply differences to originals, with optional backups")
(description