diff options
| author |   Virgil Dupras <vdupras@gentoo.org> | 2018-06-25 15:41:40 -0400 |
|---|---|---|
| committer | Virgil Dupras <vdupras@gentoo.org> | 2018-06-25 15:44:07 -0400 |
| commit | 453cc5abaf4c2a4778cfa56c06ba37d6f04ba6a7 (patch) | |
| tree | 5785e1c9dfc44385963d40fc615edb62e2904699 /sys-process/criu/files/2.9/criu-2.9-makefile.patch | |
| parent | dev-libs/rapidjson: Fix "this statement may fall through" error (diff) | |
| download | gentoo-453cc5abaf4c2a4778cfa56c06ba37d6f04ba6a7.tar.gz gentoo-453cc5abaf4c2a4778cfa56c06ba37d6f04ba6a7.tar.bz2 gentoo-453cc5abaf4c2a4778cfa56c06ba37d6f04ba6a7.zip | |
sys-process/criu: bump to v3.9
- Drop spurious patch files
- Drop spurious eutils inherit
- Add "doc" USE flag thanks to Troy C. See bug 622550
- Add missing kernel flag checks
Closes: https://bugs.gentoo.org/622550
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'sys-process/criu/files/2.9/criu-2.9-makefile.patch')
| -rw-r--r-- | sys-process/criu/files/2.9/criu-2.9-makefile.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/sys-process/criu/files/2.9/criu-2.9-makefile.patch b/sys-process/criu/files/2.9/criu-2.9-makefile.patch deleted file mode 100644 index 7ec91eebaa3..00000000000 --- a/sys-process/criu/files/2.9/criu-2.9-makefile.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/Makefile.install b/Makefile.install -index dbc22e1..23fd1ae 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 616f089..aab3189 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_BIN) ../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 1860d58..e169b0c 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. |