| 1 |
commit: 6b9c2bf74ae78ff90e7ab87393210acfab1e5b71 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 1 07:35:20 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 1 07:35:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9c2bf7 |
| 7 |
|
| 8 |
sys-process/criu: fix build failure against glibc-2.26 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-process/criu/criu-2.12.1.ebuild | 1 + |
| 13 |
.../criu/files/criu-2.12.1-glibc-2.26.patch | 49 ++++++++++++++++++++++ |
| 14 |
2 files changed, 50 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-process/criu/criu-2.12.1.ebuild b/sys-process/criu/criu-2.12.1.ebuild |
| 17 |
index fd0c92becf6..76b63750a52 100644 |
| 18 |
--- a/sys-process/criu/criu-2.12.1.ebuild |
| 19 |
+++ b/sys-process/criu/criu-2.12.1.ebuild |
| 20 |
@@ -43,6 +43,7 @@ PATCHES=( |
| 21 |
"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch |
| 22 |
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch |
| 23 |
"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch |
| 24 |
+ "${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch |
| 25 |
) |
| 26 |
|
| 27 |
criu_arch() { |
| 28 |
|
| 29 |
diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..d378cc88cff |
| 32 |
--- /dev/null |
| 33 |
+++ b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch |
| 34 |
@@ -0,0 +1,49 @@ |
| 35 |
+From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001 |
| 36 |
+From: Adrian Reber <areber@××××××.com> |
| 37 |
+Date: Thu, 29 Jun 2017 14:19:32 +0000 |
| 38 |
+Subject: [PATCH] fix building with newer glibc |
| 39 |
+ |
| 40 |
+Newer glibc releases have removed SIGUNUSED from bits/signum.h which |
| 41 |
+breaks building criu on those systems: |
| 42 |
+ |
| 43 |
+https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6 |
| 44 |
+ |
| 45 |
+SIGSYS returns the same value as SIGUNUSED and testing has shown |
| 46 |
+that criu still successfully completes zdtm with this patch. |
| 47 |
+ |
| 48 |
+Signed-off-by: Adrian Reber <areber@××××××.com> |
| 49 |
+Reviewed-by: Dmitry Safonov <dsafonov@×××××××××.com> |
| 50 |
+Signed-off-by: Andrei Vagin <avagin@×××××××××.com> |
| 51 |
+--- |
| 52 |
+ criu/cr-restore.c | 1 - |
| 53 |
+ test/zdtm/static/pthread01.c | 2 +- |
| 54 |
+ 2 files changed, 1 insertion(+), 2 deletions(-) |
| 55 |
+ |
| 56 |
+diff --git a/criu/cr-restore.c b/criu/cr-restore.c |
| 57 |
+index e8fb4adf..6ba50f18 100644 |
| 58 |
+--- a/criu/cr-restore.c |
| 59 |
++++ b/criu/cr-restore.c |
| 60 |
+@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void) |
| 61 |
+ (1 << SIGPOLL) |\ |
| 62 |
+ (1 << SIGIO) |\ |
| 63 |
+ (1 << SIGSYS) |\ |
| 64 |
+- (1 << SIGUNUSED)|\ |
| 65 |
+ (1 << SIGSTKFLT)|\ |
| 66 |
+ (1 << SIGPWR) \ |
| 67 |
+ ) |
| 68 |
+diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c |
| 69 |
+index 52f849c0..2520fcfe 100644 |
| 70 |
+--- a/test/zdtm/static/pthread01.c |
| 71 |
++++ b/test/zdtm/static/pthread01.c |
| 72 |
+@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf) |
| 73 |
+ COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); COLLECT(SIGCONT); COLLECT(SIGSTOP); |
| 74 |
+ COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); COLLECT(SIGXCPU); |
| 75 |
+ COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); |
| 76 |
+- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); |
| 77 |
++ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); |
| 78 |
+ #undef COLLECT |
| 79 |
+ |
| 80 |
+ return buf; |
| 81 |
+-- |
| 82 |
+2.14.1 |
| 83 |
+ |
Archives