diff --git a/fix-build-fail-on-gcc-10.patch b/fix-build-fail-on-gcc-10.patch new file mode 100644 index 0000000..f52e0cb --- /dev/null +++ b/fix-build-fail-on-gcc-10.patch @@ -0,0 +1,36 @@ +From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 19 Jan 2020 19:53:41 +0000 +Subject: [PATCH] src/headers/daemon.h: avoid redefinition of + 'last_selection_time' + +Noticed build failure on gcc-10 as: + +``` +gcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm +ld: twiddler.o:gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here +ld: synaptics.o:git/gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Signed-off-by: Sergei Trofimovich +--- + src/headers/daemon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/headers/daemon.h b/src/headers/daemon.h +index a8936ad..24a1a97 100644 +--- a/src/headers/daemon.h ++++ b/src/headers/daemon.h +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3], + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; diff --git a/gpm.spec b/gpm.spec index 5ff9230..3ddc71c 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,6 +1,6 @@ Name: gpm Version: 1.20.7 -Release: 23 +Release: 24 Summary: The gpm package contains a mouse server for the console and xterm License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only URL: https://www.nico.schottelius.org/software/gpm/ @@ -15,6 +15,7 @@ Patch5: gpm-1.20.7-sigemptyset.patch Patch6000: fix-highly-illegal-return-of-int-as-char-and-less-wo.patch Patch6001: fix-signedness-issue.patch +Patch6002: fix-build-fail-on-gcc-10.patch Requires(post): systemd systemd-sysv info Requires(preun): systemd info @@ -57,6 +58,7 @@ for the gpm library. %patch6000 -p1 %patch6001 -p1 +%patch6002 -p1 %build ./autogen.sh @@ -115,6 +117,9 @@ fi %{_mandir}/man?/* %changelog +* Fri Jul 30 2021 wangkerong - 1.20.7-24 +- fix build fail on gcc-10 + * Wed Jul 21 2021 yushaogui - 1.20.7-23 - delete a buildrequires for gdb