rediff patches

diff --git a/criu-python.patch b/criu-python.patch
index 11f69851ca3bf32765eee3f9646f5f2f984a3919..f0416cd0a8a3ff2b3614b65cc9de84297f560966 100644 (file)
--- a/criu-python.patch
+++ b/criu-python.patch
@@ -1,8 +1,8 @@
 --- criu-2.3/lib/Makefile.orig 2016-06-14 10:41:17.000000000 +0200
 +++ criu-2.3/lib/Makefile      2016-06-24 19:03:15.652060689 +0200
 @@ -56,7 +56,7 @@
-       $(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
+       $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
+       $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
        $(E) "  INSTALL " crit
 -      $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
 +      $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --install-purelib=$(DESTDIR)$(PYSITESCRIPTDIR) --optimize=2 --record $(CRIT_SETUP_FILES)

diff --git a/tests.patch b/tests.patch
index 4643b0283f7c595cb41d8494abb51c1457b9dd67..aac91cf3392da23c02255980db28620a3a9a964c 100644 (file)
--- a/tests.patch
+++ b/tests.patch
@@ -1,8 +1,8 @@
 --- criu-2.5/test/zdtm/static/Makefile~        2016-08-21 11:41:39.000000000 +0300
 +++ criu-2.5/test/zdtm/static/Makefile 2016-08-21 11:41:42.142986535 +0300
 @@ -402,6 +402,10 @@
- stopped02:    override CFLAGS += -DZDTM_STOPPED_TKILL
- stopped12:    override CFLAGS += -DZDTM_STOPPED_KILL -DZDTM_STOPPED_TKILL
+ bpf_hash:             LDLIBS += -lbpf
+ bpf_array:            LDLIBS += -lbpf
  
 +# grantpt, etc troubles
 +tty%: override CFLAGS += -Wno-error=implicit-function-declaration -Wno-error=int-conversion