commit: d3f90abc513aeec17cadea530fd786b5482b6369 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 25 08:54:01 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 25 10:19:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f90abc
sys-process/criu: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-process/criu/Manifest | 3 - sys-process/criu/criu-3.11.ebuild | 125 --------------------- sys-process/criu/criu-3.12.ebuild | 125 --------------------- sys-process/criu/criu-3.6.ebuild | 113 ------------------- sys-process/criu/files/2.0/criu-2.0-sysroot.patch | 9 -- sys-process/criu/files/2.3/criu-2.3-aarch64.patch | 22 ---- sys-process/criu/files/2.4/criu-2.4-makefile.patch | 78 ------------- .../criu/files/2.5/criu-2.5-automagic-libbsd.patch | 17 --- .../criu/files/criu-2.8-automagic-libbsd.patch | 17 --- sys-process/criu/files/criu-3.12-gcc-10.patch | 76 ------------- 10 files changed, 585 deletions(-) diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index 7ebc2ced395..dc1a71857ab 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -1,4 +1 @@ -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.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 -DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586 diff --git a/sys-process/criu/criu-3.11.ebuild b/sys-process/criu/criu-3.11.ebuild deleted file mode 100644 index 97a9868b722..00000000000 --- a/sys-process/criu/criu-3.11.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit toolchain-funcs linux-info flag-o-matic python-r1 - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="https://criu.org/"; -SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="doc python selinux setproctitle static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/protobuf-c - dev-libs/libnl:3 - net-libs/libnet:1.1 - sys-libs/libcap - python? ( ${PYTHON_DEPS} ) - selinux? ( sys-libs/libselinux ) - setproctitle? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - app-text/xmlto - )" -RDEPEND="${RDEPEND} - python? ( - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - )" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN - ~NETFILTER_XT_MARK" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.2/${PN}-2.2-flags.patch - "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch - "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch - "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch -) - -criu_arch() { - # criu infers the arch from $(uname -m). We never want this to happen. - case ${ARCH} in - amd64) echo "x86";; - arm64) echo "aarch64";; - *) echo "${ARCH}";; - esac -} - -src_prepare() { - default - - if ! use selinux; then - sed \ - -e 's:libselinux:no_libselinux:g' \ - -i Makefile.config || die - fi - - use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install -} - -src_configure() { - # Gold linker generates invalid object file when used with criu's custom - # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 - tc-ld-disable-gold -} - -src_compile() { - local target="all $(usex doc 'docs' '')" - RAW_LDFLAGS="$(raw-ldflags)" emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - ARCH="$(criu_arch)" \ - V=1 WERROR=0 DEBUG=0 \ - SETPROCTITLE=$(usex setproctitle) \ - PYCRIU=$(usex python) \ - ${target} -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test - fi -} - -install_crit() { - "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" -} - -src_install() { - emake \ - ARCH="$(criu_arch)" \ - PREFIX="${EPREFIX}"/usr \ - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - V=1 WERROR=0 DEBUG=0 \ - install - - use doc && dodoc CREDITS README.md - - if use python ; then - cd lib - python_foreach_impl install_crit - fi - - if ! use static-libs; then - find "${D}" -name "*.a" -delete || die - fi -} diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild deleted file mode 100644 index 7b5158f5f9b..00000000000 --- a/sys-process/criu/criu-3.12.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit toolchain-funcs linux-info flag-o-matic python-r1 - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="https://criu.org/"; -SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="doc python selinux setproctitle static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/protobuf-c - dev-libs/libnl:3 - net-libs/libnet:1.1 - sys-libs/libcap - python? ( ${PYTHON_DEPS} ) - selinux? ( sys-libs/libselinux ) - setproctitle? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - app-text/xmlto - )" -RDEPEND="${RDEPEND} - python? ( - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - )" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN - ~NETFILTER_XT_MARK" - -RESTRICT="test" - -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() { - # criu infers the arch from $(uname -m). We never want this to happen. - case ${ARCH} in - amd64) echo "x86";; - arm64) echo "aarch64";; - *) echo "${ARCH}";; - esac -} - -src_prepare() { - default - - if ! use selinux; then - sed \ - -e 's:libselinux:no_libselinux:g' \ - -i Makefile.config || die - fi - - use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install -} - -src_configure() { - # Gold linker generates invalid object file when used with criu's custom - # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 - tc-ld-disable-gold -} - -src_compile() { - local target="all $(usex doc 'docs' '')" - RAW_LDFLAGS="$(raw-ldflags)" emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - ARCH="$(criu_arch)" \ - V=1 WERROR=0 DEBUG=0 \ - SETPROCTITLE=$(usex setproctitle) \ - PYCRIU=$(usex python) \ - ${target} -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test - fi -} - -install_crit() { - "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" -} - -src_install() { - emake \ - ARCH="$(criu_arch)" \ - PREFIX="${EPREFIX}"/usr \ - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - V=1 WERROR=0 DEBUG=0 \ - install - - use doc && dodoc CREDITS README.md - - if use python ; then - cd lib - python_foreach_impl install_crit - fi - - if ! use static-libs; then - find "${D}" -name "*.a" -delete || die - fi -} diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild deleted file mode 100644 index 055d999d50a..00000000000 --- a/sys-process/criu/criu-3.6.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="http://criu.org/"; -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" -IUSE="python selinux setproctitle static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/protobuf-c - dev-libs/libnl:3 - net-libs/libnet:1.1 - sys-libs/libcap - python? ( ${PYTHON_DEPS} ) - selinux? ( sys-libs/libselinux ) - setproctitle? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto" -RDEPEND="${RDEPEND} - python? ( - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - )" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.2/${PN}-2.2-flags.patch - "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch - "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch - "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch -) - -criu_arch() { - # criu infers the arch from $(uname -m). We never want this to happen. - case ${ARCH} in - amd64) echo "x86";; - arm64) echo "aarch64";; - *) echo "${ARCH}";; - esac -} - -src_prepare() { - default - - if ! use selinux; then - sed \ - -e 's:libselinux:no_libselinux:g' \ - -i Makefile.config || die - fi -} - -src_compile() { - RAW_LDFLAGS="$(raw-ldflags)" emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - ARCH="$(criu_arch)" \ - V=1 WERROR=0 DEBUG=0 \ - SETPROCTITLE=$(usex setproctitle) \ - PYCRIU=$(usex python) \ - all docs -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test - fi -} - -install_crit() { - "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" -} - -src_install() { - emake \ - ARCH="$(criu_arch)" \ - PREFIX="${EPREFIX}"/usr \ - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - WERROR=0 \ - install - - dodoc CREDITS README.md - - if use python ; then - cd lib - python_foreach_impl install_crit - fi - - if ! use static-libs; then - find "${D}" -name "*.a" -delete || die - fi -} diff --git a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch deleted file mode 100644 index 4dcb0fb2c95..00000000000 --- a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch +++ /dev/null @@ -1,9 +0,0 @@ -Using host headers when cross compiling is not a great idea. - -Index: criu-2.0/criu/Makefile -=================================================================== ---- criu-2.0.orig/criu/Makefile -+++ criu-2.0/criu/Makefile -@@ -51,1 +51,1 @@ ccflags-y += -iquote $(SRC_DIR)/criu/pi --ccflags-y += -I/usr/include/libnl3 -+ccflags-y += -I${SYSROOT}/usr/include/libnl3 diff --git a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch deleted file mode 100644 index e857b6a1aa2..00000000000 --- a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0e2636b..ef8f78b 100644 ---- a/Makefile -+++ b/Makefile -@@ -25,7 +25,7 @@ export SRC_DIR - - # - # Architecture specific options. --ifneq ($(filter-out x86 arm arm64 ppc64,$(ARCH)),) -+ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),) - $(error "The architecture $(ARCH) isn't supported") - endif - -@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm) - SRCARCH := arm - endif - --ifeq ($(ARCH),arm64) -+ifeq ($(ARCH),aarch64) - ARCH := aarch64 - SRCARCH := aarch64 - VDSO := y diff --git a/sys-process/criu/files/2.4/criu-2.4-makefile.patch b/sys-process/criu/files/2.4/criu-2.4-makefile.patch deleted file mode 100644 index 8a0fb6d940f..00000000000 --- a/sys-process/criu/files/2.4/criu-2.4-makefile.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/Makefile.install b/Makefile.install -index e3dd551..495ad39 100644 ---- a/Makefile.install -+++ b/Makefile.install -@@ -6,24 +6,11 @@ BINDIR ?= $(PREFIX)/bin - SBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man - SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ --LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ -+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ - LIBDIR ?= $(PREFIX)/lib - INCLUDEDIR ?= $(PREFIX)/include/criu - LIBEXECDIR ?= $(PREFIX)/libexec - --# --# For recent Debian/Ubuntu with multiarch support. --DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) --ifneq "$(DEB_HOST_MULTIARCH)" "" -- LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) --else -- # -- # For most other systems -- ifeq "$(shell uname -m)" "x86_64" -- LIBDIR ?= $(PREFIX)/lib64 -- endif --endif -- - export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR - export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR - -diff --git a/lib/Makefile b/lib/Makefile -index f1c0821..3bef265 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO) - # - # Python bindings. - lib-py: -+ifeq ($(PYCRIU),yes) - $(call msg-gen, $@) - $(Q) $(MAKE) -C py all -+else -+ $(Q) echo "no py criu" -+endif - .PHONY: lib-py - - all: lib-c lib-py -@@ -43,7 +47,7 @@ clean: - $(Q) $(RM) -r build usr - .PHONY: clean - --install: lib-c lib-py ../crit/crit c/criu.pc.in -+install: lib-c ../crit/crit c/criu.pc.in - $(E) " INSTALL " $(CRIU_SO) - $(Q) mkdir -p $(DESTDIR)$(LIBDIR) - $(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR) -@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in - $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig - $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc - $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig -- $(E) " INSTALL " crit -- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) - .PHONY: install - - uninstall: -diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk -index bd40944..3cfbffa 100644 ---- a/scripts/nmk/scripts/build.mk -+++ b/scripts/nmk/scripts/build.mk -@@ -87,7 +87,7 @@ builtin-name := $(strip $(builtin-name)) - - # - # Link flags. --ld_flags := $(strip $(LDFLAGS) $(ldflags-y)) -+ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y)) - - # - # $(obj) related rules. diff --git a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch b/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch deleted file mode 100644 index de6509a745c..00000000000 --- a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/criu/Makefile.config b/criu/Makefile.config -index f531b3b..23a3b23 100644 ---- a/criu/Makefile.config -+++ b/criu/Makefile.config -@@ -2,10 +2,12 @@ include $(__nmk_dir)/utils.mk - include $(__nmk_dir)msg.mk - include $(SRC_DIR)/scripts/feature-tests.mak - -+ifeq ($(SETPROCTITLE),yes) - ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) - LIBS += -lbsd - FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD - endif -+endif - - ifeq ($(call pkg-config-check,libselinux),y) - LIBS += -lselinux diff --git a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch b/sys-process/criu/files/criu-2.8-automagic-libbsd.patch deleted file mode 100644 index 54781ea5f84..00000000000 --- a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Makefile.config b/Makefile.config -index e0d49d2..d1b2b9d 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -2,10 +2,12 @@ include $(__nmk_dir)utils.mk - include $(__nmk_dir)msg.mk - include $(SRC_DIR)/scripts/feature-tests.mak - -+ifeq ($(SETPROCTITLE),yes) - ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) - LIBS_FEATURES += -lbsd - FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD - endif -+endif - - ifeq ($(call pkg-config-check,libselinux),y) - LIBS_FEATURES += -lselinux diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch b/sys-process/criu/files/criu-3.12-gcc-10.patch deleted file mode 100644 index ff277b5b22d..00000000000 --- a/sys-process/criu/files/criu-3.12-gcc-10.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/707942 - -From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -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 <[email protected]> ---- - 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> -
