diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2016-05-27 14:43:57 +0800 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2016-05-27 15:16:34 +0800 |
| commit | 81c43e8ea9a5561629e34e1030ea835a655eb62b (patch) | |
| tree | bd92d9cf36ae13f4ae96638a55bb4941c0a241e9 /sys-process/criu/files | |
| parent | kde-apps/kdegraphics-mobipocket: Remove *-r0 (diff) | |
| download | gentoo-81c43e8ea9a5561629e34e1030ea835a655eb62b.tar.gz gentoo-81c43e8ea9a5561629e34e1030ea835a655eb62b.tar.bz2 gentoo-81c43e8ea9a5561629e34e1030ea835a655eb62b.zip | |
sys-process/criu: version bump 2.2
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-process/criu/files')
| -rw-r--r-- | sys-process/criu/files/2.2/criu-2.2-flags.patch | 13 | ||||
| -rw-r--r-- | sys-process/criu/files/2.2/criu-2.2-makefile.patch | 77 |
2 files changed, 90 insertions, 0 deletions
diff --git a/sys-process/criu/files/2.2/criu-2.2-flags.patch b/sys-process/criu/files/2.2/criu-2.2-flags.patch new file mode 100644 index 000000000000..97a806ba3414 --- /dev/null +++ b/sys-process/criu/files/2.2/criu-2.2-flags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 037d38f..7c85403 100644 +--- a/Makefile ++++ b/Makefile +@@ -97,8 +97,6 @@ endif + ifeq ($(DEBUG),1) + DEFINES += -DCR_DEBUG + CFLAGS += -O0 -ggdb3 +-else +- CFLAGS += -O2 -g + endif + + ifeq ($(GMON),1) diff --git a/sys-process/criu/files/2.2/criu-2.2-makefile.patch b/sys-process/criu/files/2.2/criu-2.2-makefile.patch new file mode 100644 index 000000000000..e4e856d8ba72 --- /dev/null +++ b/sys-process/criu/files/2.2/criu-2.2-makefile.patch @@ -0,0 +1,77 @@ +diff --git a/Makefile.install b/Makefile.install +index b3f5551..2349107 100644 +--- a/Makefile.install ++++ b/Makefile.install +@@ -6,23 +6,10 @@ 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 + +-# +-# 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 + +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. |