Skip to contentSkip to conversation

packages/gpm: Fix FTBFS with glibc 2.26

PATCH New Petr Vorel 2 participants 2 messages Nov 2, 2017

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 packages/gpm: Fix FTBFS with glibc 2.26

Use sigemptyset API instead of __sigemptyset
__sigemptyset has been removed from glibc public
API headers in upcoming (2.26) release onwards

Patch taken from
https://github.com/telmich/gpm/pull/20/commits/fdc42770596e25749f7e2ce0ea97882177397167

---
Patch also has been adopted by Fedora:
http://pkgs.fedoraproject.org/cgit/rpms/gpm.git/commit/?id=dbf661f05db3f83ed1f3e9d86a368a4811d3a971

---
 ...-sigemptyset-API-instead-of-__sigemptyset.patch | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch new file +32 -0
new file mode 100644
index 0000000000..2a5156f24e
@@ -0,0 +1,32 @@
+From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 25 Jun 2017 07:25:33 -0700
+Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
+
+__sigemptyset has been removed from glibc public
+API headers in upcoming (2.26) release onwards
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/prog/gpm-root.y | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 5126c65..76c896c 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
+                                                         LOG_DAEMON : LOG_USER);
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+-#if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
+-#else /* __GLIBC__ */
+    sigemptyset(&childaction.sa_mask);
+-#endif /* __GLIBC__ */
+    childaction.sa_flags=0;
+    sigaction(SIGCHLD,&childaction,NULL);
+ 
+-- 
+2.14.2
+
Signature · 1 line
2.14.2
#1 lore raw

PATCH 1/1 packages/gpm: Fix FTBFS with glibc 2.26

Hello,

Thanks for providing a fix for this problem!

Quoted 9 lines · Petr Vorel

Use sigemptyset API instead of __sigemptyset
__sigemptyset has been removed from glibc public
API headers in upcoming (2.26) release onwards

Patch taken from
https://github.com/telmich/gpm/pull/20/commits/fdc42770596e25749f7e2ce0ea97882177397167

Quoted 7 lines

---
Patch also has been adopted by Fedora:
http://pkgs.fedoraproject.org/cgit/rpms/gpm.git/commit/?id=dbf661f05db3f83ed1f3e9d86a368a4811d3a971

---
 ...-sigemptyset-API-instead-of-__sigemptyset.patch | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch

A few things were not entirely correct:

- The commit log should not have a Signed-off-by from Khem

- The patch description should have had your Signed-off-by

- The commit log should have included a reference to an autobuilder failure

I've applied after fixing those minor nits.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com