From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- .../criu/files/criu-3.15-protobuf-c-1.4.0.patch | 24 ++++++++++ .../criu/files/criu-3.16.1-buildsystem.patch | 56 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 sys-process/criu/files/criu-3.16.1-buildsystem.patch (limited to 'sys-process/criu/files') diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch index 5e57fa084975..86d9cd31724d 100644 --- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch +++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch @@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644 void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na)); /* Get pid of root task. 0 if not available */ +From: Radostin Stoyanov +Date: Fri, 3 Sep 2021 14:14:41 +0100 +Subject: [PATCH] lib: install images/rpc.pb-c.h + +Since commit 1c25914 compiling crun with libcriu also requires +/usr/include/criu/rpc.pb-c.h + +Signed-off-by: Radostin Stoyanov +--- + lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index f9b66701e0..575a7bad3f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,6 +1,6 @@ + CRIU_SO := libcriu.so + CRIU_A := libcriu.a +-UAPI_HEADERS := lib/c/criu.h images/rpc.proto criu/include/version.h ++UAPI_HEADERS := lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h + + # + # File to keep track of files installed by setup.py diff --git a/sys-process/criu/files/criu-3.16.1-buildsystem.patch b/sys-process/criu/files/criu-3.16.1-buildsystem.patch new file mode 100644 index 000000000000..7b83d1c8fe51 --- /dev/null +++ b/sys-process/criu/files/criu-3.16.1-buildsystem.patch @@ -0,0 +1,56 @@ +diff --git a/Makefile.config b/Makefile.config +index 6e3e1b062..830a66e83 100644 +--- a/Makefile.config ++++ b/Makefile.config +@@ -5,9 +5,6 @@ include scripts/feature-tests.mak + ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) + LIBS_FEATURES += -lbsd + FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD +-else +- $(info Note: Building without setproctitle() and strlcpy() support.) +- $(info $(info) To enable these features, please install libbsd-devel (RPM) / libbsd-dev (DEB).) + endif + + ifeq ($(call pkg-config-check,libselinux),y) +@@ -25,8 +22,6 @@ ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy) + LIBS_FEATURES += -lgnutls + export CONFIG_GNUTLS := y + FEATURE_DEFINES += -DCONFIG_GNUTLS +-else +- $(info Note: Building without GnuTLS support) + endif + + ifeq ($(call pkg-config-check,libnftables),y) +@@ -41,9 +36,6 @@ ifeq ($(call pkg-config-check,libnftables),y) + $(warning Warn: you have libnftables installed but it has incompatible API) + $(warning Warn: Building without nftables support) + endif +-else +- $(warning Warn: you have no libnftables installed) +- $(warning Warn: Building without nftables support) + endif + + export LIBS += $(LIBS_FEATURES) +diff --git a/lib/Makefile b/lib/Makefile +index 575a7bad3..af88668c5 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -58,8 +58,6 @@ install: lib-c lib-a lib-py crit/crit lib/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)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc + $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig +- $(E) " INSTALL " crit +- $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) + .PHONY: install + + uninstall: +diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py +index 871e55921..50745c294 100644 +--- a/scripts/crit-setup.py ++++ b/scripts/crit-setup.py +@@ -1,4 +1,4 @@ +-from distutils.core import setup ++from setuptools import setup + + setup(name="crit", + version="0.0.1", -- cgit v1.2.3