diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-process/criu/files | |
parent | db063b515939ab15261136b24e4bc44386335c0c (diff) |
gentoo resync : 30.09.2020
Diffstat (limited to 'sys-process/criu/files')
6 files changed, 0 insertions, 219 deletions
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 4dcb0fb2c95a..000000000000 --- 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 e857b6a1aa2b..000000000000 --- 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 8a0fb6d940fc..000000000000 --- 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 de6509a745c2..000000000000 --- 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 54781ea5f841..000000000000 --- 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 ff277b5b22df..000000000000 --- 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 <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> - |