summary refs log tree commit diff
path: root/gnu/packages/base.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-22 22:16:36 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-22 22:40:48 +0200
commitd3878d3d5152af371e572cd38f08414b3ba82abc (patch)
treeea2d2da98706393d18a3418c557bec990e5aa088 /gnu/packages/base.scm
parent921f8e63ddf8279294a107c75eccc6438ce06bfa (diff)
downloadguix-d3878d3d5152af371e572cd38f08414b3ba82abc.tar.gz
gnu: patch: Work around a cross-compilation issue.
Reported by Marius Bakke <mbakke@fastmail.com>
at <https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00157.html>.

* gnu/packages/base.scm (patch)[arguments]: New field.
Diffstat (limited to 'gnu/packages/base.scm')
-rw-r--r--gnu/packages/base.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1be63c37b2..a163018cbd 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