diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-06-25 22:34:43 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:25 +0200 |
| commit | bd66426dc33b66d9b551c48a8091b939126ce8b4 (patch) | |
| tree | e8d92253eb1c696957cae11be4e97b6e374970b4 /meta-oe/recipes-support | |
| parent | 01d70f84b1f53247b911c50506e5f1a3238d3732 (diff) | |
| download | meta-openembedded-contrib-bd66426dc33b66d9b551c48a8091b939126ce8b4.tar.gz | |
gpm: Use sigemptyset() API for glibc as well
glibc has removed __sigemptyset
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-support/gpm/gpm_git.bb | 4 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch new file mode 100644 index 0000000000..a9198166a9 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch @@ -0,0 +1,34 @@ +From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + 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.13.1 + diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 69f12d9b89..51c4dd6397 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -12,10 +12,12 @@ SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" DEPENDS = "ncurses" SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://init \ file://no-docs.patch \ file://processcreds.patch \ file://gpm.service.in \ - file://init" + file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ + " S = "${WORKDIR}/git" |