summaryrefslogtreecommitdiff
path: root/sys-process/criu/files
diff options
context:
space:
mode:
Diffstat (limited to 'sys-process/criu/files')
-rw-r--r--sys-process/criu/files/criu-flags.patch55
-rw-r--r--sys-process/criu/files/criu-makefile.patch20
2 files changed, 75 insertions, 0 deletions
diff --git a/sys-process/criu/files/criu-flags.patch b/sys-process/criu/files/criu-flags.patch
new file mode 100644
index 0000000..84f5037
--- /dev/null
+++ b/sys-process/criu/files/criu-flags.patch
@@ -0,0 +1,55 @@
+--- criu-1.3.1/Makefile
++++ criu-1.3.1/Makefile
+@@ -102,9 +102,6 @@
+
+ ifeq ($(DEBUG),1)
+ DEFINES += -DCR_DEBUG
+- CFLAGS += -O0 -ggdb3
+-else
+- CFLAGS += -O2
+ endif
+
+ ifeq ($(GMON),1)
+--- criu-1.3.1/test/zdtm/lib/Makefile
++++ criu-1.3.1/test/zdtm/lib/Makefile
+@@ -1,6 +1,6 @@
+ include ../Makefile.inc
+
+-CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
++CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+ CFLAGS += $(USERCFLAGS)
+
+ LIBDIR = .
+--- criu-1.3.1/test/zdtm/live/static/Makefile
++++ criu-1.3.1/test/zdtm/live/static/Makefile
+@@ -3,7 +3,7 @@
+ LIBDIR = ../../lib
+ LIB = $(LIBDIR)/libzdtmtst.a
+ override CPPFLAGS += -I$(LIBDIR)
+-CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
++CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+ CFLAGS += $(USERCFLAGS)
+
+ TST_NOFILE = \
+--- criu-1.3.1/test/zdtm/live/streaming/Makefile
++++ criu-1.3.1/test/zdtm/live/streaming/Makefile
+@@ -3,7 +3,7 @@
+ LIBDIR = ../../lib
+ LIB = $(LIBDIR)/libzdtmtst.a
+ override CPPFLAGS += -I$(LIBDIR)
+-CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing
++CFLAGS = -Wall -fno-strict-aliasing
+ CFLAGS += $(USERCFLAGS)
+
+ TST_NOFILE = \
+--- criu-1.3.1/test/zdtm/live/transition/Makefile
++++ criu-1.3.1/test/zdtm/live/transition/Makefile
+@@ -3,7 +3,7 @@
+ LIBDIR = ../../lib
+ LIB = $(LIBDIR)/libzdtmtst.a
+ override CPPFLAGS += -I$(LIBDIR)
+-CFLAGS = -g -O2 -Wall -Werror
++CFLAGS = -Wall
+ CFLAGS += $(USERCFLAGS)
+
+ TST_NOFILE = \
diff --git a/sys-process/criu/files/criu-makefile.patch b/sys-process/criu/files/criu-makefile.patch
new file mode 100644
index 0000000..50781c1
--- /dev/null
+++ b/sys-process/criu/files/criu-makefile.patch
@@ -0,0 +1,20 @@
+--- criu-1.3.1/Makefile.inc
++++ criu-1.3.1/Makefile.inc
+@@ -15,15 +15,9 @@
+ 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
+-# 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)
+-# For most other systems
+-else ifeq "$(shell uname -m)" "x86_64"
++ifeq "$(shell uname -m)" "x86_64"
+ LIBDIR := $(PREFIX)/lib64
+ endif
+