diff options
Diffstat (limited to 'sys-process/criu/files/2.1/criu-2.1-makefile.patch')
| -rw-r--r-- | sys-process/criu/files/2.1/criu-2.1-makefile.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/sys-process/criu/files/2.1/criu-2.1-makefile.patch b/sys-process/criu/files/2.1/criu-2.1-makefile.patch new file mode 100644 index 000000000000..fb316391aa60 --- /dev/null +++ b/sys-process/criu/files/2.1/criu-2.1-makefile.patch @@ -0,0 +1,75 @@ +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 f372a52..7312fcb 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -21,8 +21,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 +@@ -39,7 +43,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) +@@ -51,6 +55,4 @@ 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 +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. |