public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

criu: fix build with glibc 2.26

Browse Source
This commit is contained in:
Orivej Desh 2017-11-28 08:11:08 +00:00
parent c8a60e36e2
commit f8077b7ef1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void)
(1 << SIGSYS) |\
- (1 << SIGUNUSED)|\
(1 << SIGSTKFLT)|\
--- a/test/zdtm/static/pthread01.c
+++ b/test/zdtm/static/pthread01.c
@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf)
COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
#undef COLLECT

4
pkgs/os-specific/linux/criu/default.nix
View File

@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
}; };
patches = [ ./criu-2.12.1-glibc-2.26.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl ]; nativeBuildInputs = [ pkgconfig docbook_xsl ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
patchPhase = '' postPatch = ''
chmod +w ./scripts/gen-offsets.sh chmod +w ./scripts/gen-offsets.sh
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""