03/07: gnu: gpm: Adjust for GCC 10.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 708fc4a2b0f4fd72585666f829e70fbbb8dd6451
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jun 18 23:50:59 2021 +0200

    gnu: gpm: Adjust for GCC 10.
    
    * gnu/packages/linux.scm (gpm)[source](modules, snippet): New fields.
---
 gnu/packages/linux.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 360b1d5..49c29fa 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