diff options
Diffstat (limited to 'sys-process/criu')
| -rw-r--r-- | sys-process/criu/Manifest | 3 | ||||
| -rw-r--r-- | sys-process/criu/criu-3.12.ebuild | 3 | ||||
| -rw-r--r-- | sys-process/criu/files/criu-3.12-gcc-10.patch | 76 |
3 files changed, 80 insertions, 2 deletions
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index c7ed753369ca..94140c772321 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -6,10 +6,11 @@ AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3 +AUX criu-3.12-gcc-10.patch 2059 BLAKE2B 6a541cc5350297b082bfb8d0535dee7e266b1d87a19b8e06ecaebdd00fd69eab0c318d4928e42dda0a0b95791125b67fe1507e2cb16055910bc58dcc155e7087 SHA512 69153aefa50ef8dc45e0bded4b6a3e4bcabc8fef6e37fd2f77fae4b1b75b98ad236d00f297b9df5010aed34ef6e811affcf812b4fc1bb167c6ca0dd9ace5ef88 DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586 EBUILD criu-3.11.ebuild 2900 BLAKE2B b8589a947a4672aaf53f341ddf590910c5e29eba5cec10da0a4a49e8fee7f2dfbe874790e0cd6531bb6fea9c04df36c0884384491e6fcca5805dee7243351ac7 SHA512 b60f26c2fd42745681c4cebb90a7345d2dc8653ffb9a346830b220361a676200813efa3ab1fa7f86a9509badd187811b7c60450185a6531e09be69f9e26e5518 -EBUILD criu-3.12.ebuild 2858 BLAKE2B 60bf73a978c8269d13c2246ffe6ad96e9a695af10d4142872047f1b138a4288c85e2f3f1b000d602e9f72b96a50653600e3ba170938833d02ef3f8455108fe07 SHA512 3a7ae106745a40bc7a2d97a339dc6dfc698cdc4575708dcfe017206284dfbab33bc44169cb859496f78f6c787c34675a97a98cf03c48e6943d9051369754846a +EBUILD criu-3.12.ebuild 2908 BLAKE2B e2302e92541f7877fe7dacf4f6cfb6b900b1fc470a63c6146ac82b3510bcff8bc77459bd4ca00be0aba98d4b9543121ec3e62a88d219cec58ceecaf7be16b241 SHA512 ad077cf2ce8f40e7a35042dd4468677ec1e301c2ef472ce6158810408ba3b4c44352cd27e4f7941d86d7c5fb1b66fdc507a1ad173b5d050045be4d3a255c2bea EBUILD criu-3.6.ebuild 2530 BLAKE2B fa1a972b8f6c15296ac8bf9519e2e4e0758fd2aad6582014b84ec72b12384385c80f0b9477301f333745ab8d1833c7521d77fa6218b1f7a3de7a4f90cdd3886b SHA512 979baf7eca6befc56c951f063ec8775d35401136f4783009829229698ae9ed8b598737f8869c016fd5a266985df4be15048ea7e8aed550160f5281348954ed73 MISC metadata.xml 379 BLAKE2B dab824549f773238cce7faf9e016b1b49c6215902f8d59c6518067874b80a4eb922c5e57e2db1815b1d761ab299c93b269b8f6628d3fc8e83ccf85c66e26f530 SHA512 d0dfe8190ed96ba069d4e932fa599752803a9560d62425cd1275cec6c309b88ce14218d7be0ff6e841c052228a421070abc9ffd5a66cb9dd59dbb80e920b95df diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild index 9321be89fc07..7b5158f5f9b0 100644 --- a/sys-process/criu/criu-3.12.ebuild +++ b/sys-process/criu/criu-3.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/2.2/${PN}-2.2-flags.patch "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch + "${FILESDIR}"/${PN}-3.12-gcc-10.patch # backport ) criu_arch() { diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch b/sys-process/criu/files/criu-3.12-gcc-10.patch new file mode 100644 index 000000000000..ff277b5b22df --- /dev/null +++ b/sys-process/criu/files/criu-3.12-gcc-10.patch @@ -0,0 +1,76 @@ +https://bugs.gentoo.org/707942 + +From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sun, 2 Feb 2020 18:45:59 +0000 +Subject: [PATCH] criu: fix build failure against gcc-10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159: + multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here +make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1 +``` + +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. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/707942 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + criu/config.c | 1 + + criu/include/cr_options.h | 2 +- + criu/include/pstree.h | 2 +- + criu/include/tun.h | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + +--- a/criu/config.c ++++ b/criu/config.c +@@ -30,6 +30,7 @@ + #include "common/xmalloc.h" + + struct cr_options opts; ++char *rpc_cfg_file; + + static int count_elements(char **to_count) + { +--- a/criu/include/cr_options.h ++++ b/criu/include/cr_options.h +@@ -156,7 +156,7 @@ struct cr_options { + }; + + extern struct cr_options opts; +-char *rpc_cfg_file; ++extern char *rpc_cfg_file; + + extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state); + extern int check_options(void); +--- a/criu/include/pstree.h ++++ b/criu/include/pstree.h +@@ -42,7 +42,7 @@ enum { + }; + #define FDS_EVENT (1 << FDS_EVENT_BIT) + +-struct pstree_item *current; ++extern struct pstree_item *current; + + struct rst_info; + /* See alloc_pstree_item() for details */ +--- a/criu/include/tun.h ++++ b/criu/include/tun.h +@@ -5,7 +5,7 @@ + #define TUN_MINOR 200 + #endif + +-struct ns_id *ns; ++extern struct ns_id *ns; + + #include <linux/netlink.h> + |