Compare commits
10 Commits
e8aedd4ea9
...
22effd15d4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22effd15d4 | ||
|
|
f7c9816320 | ||
|
|
cd5170b714 | ||
|
|
41c1d9a338 | ||
|
|
742e23d5fc | ||
|
|
7874073d7c | ||
|
|
66af8a31a3 | ||
|
|
8db25a4ce5 | ||
|
|
eff0b31622 | ||
|
|
ccb4d74673 |
36
fix-build-fail-on-gcc-10.patch
Normal file
36
fix-build-fail-on-gcc-10.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
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 <slyfox@gentoo.org>
|
||||
---
|
||||
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;
|
||||
@ -9,6 +9,7 @@ Description=Console Mouse manager
|
||||
ExecStart=/usr/sbin/gpm -m /dev/input/mice -t exps2
|
||||
Type=forking
|
||||
PIDFile=/var/run/gpm.pid
|
||||
ExecStartPost=/usr/bin/sleep 0.1
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
27
gpm.spec
27
gpm.spec
@ -1,6 +1,6 @@
|
||||
Name: gpm
|
||||
Version: 1.20.7
|
||||
Release: 22
|
||||
Release: 27
|
||||
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,12 +15,15 @@ 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
|
||||
Requires(postun): systemd
|
||||
%if 0%{?build_cross} == 0
|
||||
Requires: linuxconsoletools
|
||||
BuildRequires: autoconf automake bison gawk libtool libcap-ng-devel ncurses-devel sed systemd texinfo gdb
|
||||
%endif
|
||||
BuildRequires: autoconf automake bison gawk libtool libcap-ng-devel ncurses-devel sed systemd texinfo
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%description
|
||||
@ -57,6 +60,7 @@ for the gpm library.
|
||||
|
||||
%patch6000 -p1
|
||||
%patch6001 -p1
|
||||
%patch6002 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@ -76,20 +80,16 @@ cp %{SOURCE1} %{buildroot}%{_unitdir}
|
||||
chmod 644 %{buildroot}%{_unitdir}/gpm.service
|
||||
|
||||
%post
|
||||
%systemd_post gpm.service
|
||||
if [ -e %{_infodir}/gpm.info.gz ]; then
|
||||
/sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
%systemd_preun gpm.service
|
||||
if [ $1 = 0 -a -e %{_infodir}/gpm.info.gz ]; then
|
||||
/sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart gpm.servic
|
||||
|
||||
%ldconfig_post
|
||||
%ldconfig_postun
|
||||
|
||||
@ -115,6 +115,21 @@ fi
|
||||
%{_mandir}/man?/*
|
||||
|
||||
%changelog
|
||||
* Mon Mar 27 2023 zhangpan <zhangpan103@h-partners.com.com> - 1.20.7-27
|
||||
- add build_cross to avoid install linuxconsoletools in self-build
|
||||
|
||||
* Tue Sep 06 2022 wangkerong <wangkerong@h-partners.com.com> - 1.20.7-26
|
||||
- Add ExecStartPost option to gpm.service for solve error message when gpm service start
|
||||
|
||||
* Wed Dec 22 2021 xingxing <xingxing9@huawei.com> - 1.20.7-25
|
||||
- fix update error
|
||||
|
||||
* Fri Jul 30 2021 wangkerong <wangkerong@huawei.com> - 1.20.7-24
|
||||
- fix build fail on gcc-10
|
||||
|
||||
* Wed Jul 21 2021 yushaogui <yushaogui@huawei.com> - 1.20.7-23
|
||||
- delete a buildrequires for gdb
|
||||
|
||||
* Fri Dec 11 2020 zhujunhao <zhujunhao8@huawei.com> - 1.20.7-22
|
||||
- modify for patch invalid
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user