1 files changed, 0 insertions, 77 deletions
diff --git a/sys-process/criu/files/2.0/criu-2.0-makefile.patch b/sys-process/criu/files/2.0/criu-2.0-makefile.patch
deleted file mode 100644
index a2783c711457..000000000000
--- a/sys-process/criu/files/2.0/criu-2.0-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index 6fcf25e..103373b 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -5,23 +5,10 @@ PREFIX		?= /usr/local
- 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
- 
--#
--# 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 SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index 0cd59a1..63bdaba 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -20,10 +20,12 @@ PHONY += lib-c
- 
- #
- # Python bindings.
-+ifeq ($(PYCRIU),yes)
- lib-py:
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
- PHONY += lib-py
-+endif
- 
- clean:
- 	$(call msg-clean, lib-c)
-@@ -37,7 +39,7 @@ all: $(PHONY)
- 	@true
- PHONY += all
- 
--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)
-@@ -49,8 +51,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)
- .PHONY: install
- 
- .PHONY: $(PHONY) clean
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index 10a5d44..ffe2a3c 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -43,7 +43,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # Prepare targets.