summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-06-18 23:50:59 +0200
committerMarius Bakke <marius@gnu.org>2021-06-19 17:09:51 +0200
commit708fc4a2b0f4fd72585666f829e70fbbb8dd6451 (patch)
tree47fd9c36bbb1acd86162d6f1b19470bffea284a7 /gnu
parent2b2ecbace4cf404cc4541be16bdc04d2d9ba88c3 (diff)
downloadguix-708fc4a2b0f4fd72585666f829e70fbbb8dd6451.tar.gz
gnu: gpm: Adjust for GCC 10.
* gnu/packages/linux.scm (gpm)[source](modules, snippet): New fields.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 360b1d59a6..49c29fa470 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5049,7 +5049,16 @@ Ridge, Joliet, and zisofs.")
               (patches (search-patches "gpm-glibc-2.26.patch"))
               (sha256
                (base32
-                "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"))))
+                "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Take a patch from upstream to fix building with -fno-common,
+                  ;; which is default in GCC 10:
+                  ;;  https://github.com/telmich/gpm/pull/37
+                  (substitute* "src/headers/daemon.h"
+                    (("^time_t[[:blank:]]+last_selection_time;")
+                      "extern time_t           last_selection_time;"))))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases